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

Timestamp:

Feb 8, 2005, 8:22:20 AM (20 years ago)

Author:

bird

Message:

More proper .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);
 
@@ -1397 +1401 @@
   /* If we are running at least one job already and the load average
      is too high, make this one wait.  */
-  if (!c->remote && job_slots_used > 0 && load_too_high ())
+  if (!c->remote && job_slots_used > 0 && 
+      (not_parallel || (c->file->command_flags & COMMANDS_NOTPARALLEL) || load_too_high ()))
     {
       /* Put this child on the chain of children waiting for the load average
@@ -1406 +1411 @@
       return 0;
     }
+
+  if (c->file->command_flags & COMMANDS_NOTPARALLEL)
+    ++not_parallel;
 
   /* Start the first command; reap_children will run later command lines.  */
@@ -1430 +1438 @@
     case cs_finished:
       notice_finished_file (f);
+      if ((c->file->command_flags & COMMANDS_NOTPARALLEL) && not_parallel >= 1)
+        --not_parallel;
       free_child (c);
       break;
@@ -1924 +1934 @@
     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.  */