Changeset 218 for trunk/src/gmake/job.c

Timestamp:

Feb 8, 2005, 10:19:09 AM (20 years ago)

Author:

bird

Message:

2nd try on .NOTPARALLEL.

File:

• trunk/src/gmake/job.c (modified) (5 diffs)

trunk/src/gmake/job.c

@@ -812 +812 @@
         lastc->next = c->next;
 
-      /* update not_parallel if the file was flagged for that. */
-      if ((c->file->command_flags & COMMANDS_NOTPARALLEL) && not_parallel >= 1)
-        --not_parallel;
-
       free_child (c);
 
@@ -1405 +1401 @@
     {
       /* Put this child on the chain of children waiting for the load average
-         to go down.  */
+         to go down. if not paralell, put it last.  */
       set_command_state (f, cs_running);
       c->next = waiting_jobs;
-      waiting_jobs = c;
+      if (c->next && (c->file->command_flags & COMMANDS_NOTPARALLEL))
+        { 
+          struct child *prev = waiting_jobs;
+          while (prev->next)
+            prev = prev->next;
+          c->next = 0;
+          prev->next = c;
+        }
+      else
+        waiting_jobs = c;
       return 0;
     }
 
   if (c->file->command_flags & COMMANDS_NOTPARALLEL)
-    ++not_parallel;
+    {
+      assert(not_parallel == 0);
+      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel, not_parallel + 1, c->file, c->file->name));
+      ++not_parallel;
+    }
+
 
   /* Start the first command; reap_children will run later command lines.  */
@@ -1438 +1448 @@
     case cs_finished:
       notice_finished_file (f);
-      if ((c->file->command_flags & COMMANDS_NOTPARALLEL) && not_parallel >= 1)
-        --not_parallel;
       free_child (c);
       break;
@@ -1687 +1695 @@
   (void) start_waiting_job (c);
 
-  if (job_slots == 1 || not_parallel)
+  if (job_slots == 1 || not_parallel < 0)
     /* Since there is only one job slot, make things run linearly.
        Wait for the child to die, setting the state to `cs_finished'.  */
@@ -1934 +1942 @@
     if (job_slots_used > 0)
       --job_slots_used;
-
-    /* update not_parallel if the file was flagged for that. */
-    if ((c->file->command_flags & COMMANDS_NOTPARALLEL) && not_parallel >= 1)
-      --not_parallel;
 
     /* If the job failed, and the -k flag was not given, die.  */