Changeset 352 in kBuild

Timestamp:

Dec 12, 2005 3:07:31 AM (19 years ago)

Author:

bird

Message:

Fixed not_parallel assertion in notice_finished_file.

Location:

trunk/src/gmake

Files:

• commands.c (modified) (1 diff)
• commands.h (modified) (1 diff)
• job.c (modified) (1 diff)
• remake.c (modified) (1 diff)

trunk/src/gmake/commands.c

@@ -385 +385 @@
     {
       /* If there are no commands, assume everything worked.  */
+      file->command_flags |= COMMANDS_NO_COMMANDS;
       set_command_state (file, cs_running);
       file->update_status = 0;

trunk/src/gmake/commands.h

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

trunk/src/gmake/job.c

@@ -1493 +1493 @@
   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);
-      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel, not_parallel + 1, c->file, c->file->name));
       ++not_parallel;
     }

trunk/src/gmake/remake.c

@@ -795 +795 @@
   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));
+  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));
+  if (ran && (file->command_flags & (COMMANDS_NOTPARALLEL | COMMANDS_NO_COMMANDS))
+      == COMMANDS_NOTPARALLEL)
+    {
+      DB (DB_KMK, (_("not_parallel %d -> %d (file=%p `%s')\n"), not_parallel,
+                   not_parallel - 1, file, file->name));
+      assert(not_parallel >= 1);
       --not_parallel;
     }