Changeset 516 in kBuild for trunk/src

Timestamp:

Sep 15, 2006 9:15:26 AM (19 years ago)

Author:

bird

Message:

More parallel build fixes.

File:

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

trunk/src/gmake/job.c

@@ -1514 +1514 @@
   c->remote = start_remote_job_p (1);
 
+  if (c->file->command_flags & COMMANDS_NOTPARALLEL)
+    {
+      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel, not_parallel + 1, c->file, c->file->name));
+      ++not_parallel;
+    }
+
   /* 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 && (not_parallel || (c->file->command_flags & COMMANDS_NOTPARALLEL) || load_too_high ()))
+      && ((job_slots_used > 0 && (not_parallel > 0 || load_too_high ()))
 #ifdef WINDOWS32
           || (process_used_slots () >= MAXIMUM_WAIT_OBJECTS)
@@ -1541 +1547 @@
     }
 
-  if (c->file->command_flags & COMMANDS_NOTPARALLEL)
-    {
-      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel, not_parallel + 1, c->file, c->file->name));
-      assert(not_parallel == 0);
-      ++not_parallel;
-    }
-
 
   /* Start the first command; reap_children will run later command lines.  */
@@ -1835 +1834 @@
        Wait for the child to die, setting the state to `cs_finished'.  */
     while (file->command_state == cs_running
-        && (job_slots == 1 || not_parallel > 0))
+        && (job_slots == 1 || not_parallel > 0)
+        && (children != 0 || shell_function_pid != 0) /* reap_child condition - hackish! */)
       reap_children (1, 0);
 
@@ -1986 +1986 @@
       job = waiting_jobs;
       waiting_jobs = job->next;
+
+      /* we've already counted it. */
+      if (job->file->command_flags & COMMANDS_NOTPARALLEL)
+        {
+          DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s') [waiting job]\n"), not_parallel, not_parallel - 1, job->file, job->file->name));
+          --not_parallel;
+        }
 
       /* Try to start that job.  We break out of the loop as soon