Changeset 217

Timestamp:

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

Author:

bird

Message:

More proper .NOTPARALLEL.

Location:

trunk/src/gmake

Files:

• commands.h (modified) (1 diff)
• file.c (modified) (1 diff)
• job.c (modified) (5 diffs)
• main.c (modified) (1 diff)

trunk/src/gmake/commands.h ¶

@@ -36 +36 @@
 #define COMMANDS_SILENT         2 /* Silent: @.  */
 #define COMMANDS_NOERROR        4 /* No errors: -.  */
+#define COMMANDS_NOTPARALLEL    64 /* kmk: the commands must be executed alone. */
 
 extern void execute_file_commands PARAMS ((struct file *file));

trunk/src/gmake/file.c ¶

@@ -522 +522 @@
     posix_pedantic = 1;
 
+  /* kmk changed */
   f = lookup_file (".NOTPARALLEL");
   if (f != 0 && f->is_target)
-    not_parallel = 1;
+    {
+      if (f->deps == 0)
+        not_parallel = 1;
+      else
+        for (d = f->deps; d != 0; d = d->next)
+          for (f2 = d->file; f2 != 0; f2 = f2->prev)
+            f2->command_flags |= COMMANDS_NOTPARALLEL;
+    }
+
 }
 

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

trunk/src/gmake/main.c ¶

@@ -458 +458 @@
 int posix_pedantic;
 
-/* Nonzero if we have seen the `.NOTPARALLEL' target.
-   This turns off parallel builds for this invocation of make.  */
+/* 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. */
 
 int not_parallel;