Changeset 218 for trunk/src

Timestamp:

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

Author:

bird

Message:

2nd try on .NOTPARALLEL.

Location:

trunk/src/gmake

Files:

• debug.h (modified) (1 diff)
• file.c (modified) (1 diff)
• job.c (modified) (5 diffs)
• main.c (modified) (2 diffs)
• remake.c (modified) (2 diffs)

trunk/src/gmake/debug.h

@@ -25 +25 @@
 #define DB_IMPLICIT     (0x008)
 #define DB_MAKEFILES    (0x100)
+#define DB_KMK          (0x800)
 
 #define DB_ALL          (0xfff)

trunk/src/gmake/file.c

@@ -527 +527 @@
     {
       if (f->deps == 0)
-        not_parallel = 1;
+        {
+          DB (DB_KMK, (_("not_parallel -1\n")));
+          not_parallel = -1;
+        }
       else
         for (d = f->deps; d != 0; d = d->next)

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.  */

trunk/src/gmake/main.c

@@ -458 +458 @@
 int posix_pedantic;
 
-/* Nonzero if we have seen the `.NOTPARALLEL' target with empty dependency list.
-   Incremented while executing targets `.NOTPARALLEL' is depending on.
-   This temporarily or permanently turns off parallel builds. */
+/* Negative if we have seen the `.NOTPARALLEL' target with empty dependency list.
+   Zero if no `.NOTPARALLEL' or no file in the dependency list is being executed.
+   Positive when a file in `.NOTPARALLEL' is being made.
+   Nonzero values have the effect of disabeling parallel building. */
 
 int not_parallel;
@@ -592 +593 @@
             case 'v':
               db_level |= DB_BASIC | DB_VERBOSE;
+              break;
+            case 'k':
+              db_level |= DB_KMK;
               break;
             default:

trunk/src/gmake/remake.c

@@ -726 +726 @@
   int ran = file->command_state == cs_running;
   int touched = 0;
-
+DB (DB_JOBS, (_("notice_finished_file - entering: file=%p `%s' update_status=%d command_state=%d\n"), file, file->name, file->update_status, file->command_state));
   file->command_state = cs_finished;
   file->updated = 1;
+  
+  /* update not_parallel if the file was flagged for that. */
+  if (ran && (file->command_flags & COMMANDS_NOTPARALLEL))
+    {
+      assert(not_parallel == 1);
+      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel, not_parallel - 1, file, file->name));
+      --not_parallel;
+    }
 
   if (touch_flag
@@ -826 +834 @@
        So mark it now as "succeeded".  */
     file->update_status = 0;
+
+DB (DB_JOBS, (_("notice_finished_file - leaving: file=%p `%s' update_status=%d command_state=%d\n"), file, file->name, file->update_status, file->command_state));
 }