Changeset 382 in kBuild

Timestamp:

Jan 12, 2006 3:59:50 AM (19 years ago)

Author:

bird

Message:

Fixed bad parallel bug.

File:

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

trunk/src/gmake/job.c

@@ -1464 +1464 @@
 {
   struct file *f = c->file;
-  DB (DB_KMK, (_("start_waiting_job %p (`%s') command_flags=%#x\n"), c, c->file->name, c->file->command_flags));
+  DB (DB_KMK, (_("start_waiting_job %p (`%s') command_flags=%#x slots=%d/%d\n"), c, c->file->name, c->file->command_flags, job_slots_used, job_slots));
 
   /* If we can start a job remotely, we always want to, and don't care about
@@ -1478 +1478 @@
     {
       /* Put this child on the chain of children waiting for the load average
-         to go down. if not paralell, put it last.  */
+         to go down. if not parallel, put it last.  */
       set_command_state (f, cs_running);
       c->next = waiting_jobs;
@@ -1510 +1510 @@
     case cs_running:
       c->next = children;
-      DB (DB_JOBS, (_("Putting child 0x%08lx (%s) PID %ld%s on the chain.\n"),
+      DB (DB_JOBS, (_("Putting child 0x%08lx (%s) PID %ld%s on the chain. (%u/%u)\n"),
                     (unsigned long int) c, c->file->name,
-                    (long) c->pid, c->remote ? _(" (remote)") : ""));
+                    (long) c->pid, c->remote ? _(" (remote)") : "", job_slots_used + 1, job_slots));
       children = c;
       /* One more job slot is in use.  */
@@ -1781 +1781 @@
   (void) start_waiting_job (c);
 
-  if (job_slots == 1 || not_parallel < 0)
+  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'.  */