Changeset 3432 in kBuild

Timestamp:

Sep 1, 2020 1:17:57 PM (5 years ago)

Author:

bird

Message:

kmk: Quick output hack to repeat the failure output at the end of die() as it may easily get lost in output from other jobs (problem on systems with lots of cores).

Location:

trunk/src/kmk

Files:

• job.c (modified) (3 diffs)
• main.c (modified) (3 diffs)
• makeint.h (modified) (1 diff)
• output.c (modified) (3 diffs)
• output.h (modified) (1 diff)

trunk/src/kmk/job.c

@@ -1062 +1062 @@
 #ifndef NO_OUTPUT_SYNC
       /* Synchronize any remaining parallel output.  */
+# ifdef KMK
+      c->output.dont_truncate = !err && child_failed && !dontcare && !keep_going_flag && !handling_fatal_signal;
+# endif
       output_dump (&c->output);
 #endif
@@ -1096 +1099 @@
         lastc->next = c->next;
 
+#ifdef KMK /* Repeat the error  */
+      /* If the job failed, and the -k flag was not given, die,
+         unless we are already in the process of dying.  */
+      if (!err && child_failed && !dontcare && !keep_going_flag &&
+          /* fatal_error_signal will die with the right signal.  */
+          !handling_fatal_signal)
+        {
+          unblock_sigs ();
+          die_with_job_output (child_failed, &c->output);
+        }
+#endif
+
       free_child (c);
 
       unblock_sigs ();
 
+#ifndef KMK /* See above. */
       /* If the job failed, and the -k flag was not given, die,
          unless we are already in the process of dying.  */
@@ -1106 +1122 @@
           !handling_fatal_signal)
         die (child_failed);
+#endif
 
       /* Only block for one child.  */

trunk/src/kmk/main.c

@@ -4359 +4359 @@
 
 void
+#ifdef KMK
+die_with_job_output (int status, struct output *out)
+#else
 die (int status)
+#endif
 {
   static char dying = 0;
 #ifdef KMK
   static char need_2nd_error = 0;
+  static char need_2nd_error_output = 0;
 #endif
 
@@ -4381 +4386 @@
               || print_data_base_flag
               || print_stats_flag))
-        need_2nd_error = 1;
+        {
+          need_2nd_error = 1;
+          need_2nd_error_output = job_slots_used > 2
+                               && out == NULL
+                               && out != &make_sync;
+        }
 #endif /* KMK */
 
@@ -4457 +4467 @@
   if (need_2nd_error != 0)
     ON (error, NILF, _("*** Exiting with status %d"), status);
+  if (out)
+  {
+      out->dont_truncate = 0;
+      if (need_2nd_error_output)
+        output_dump (out);
+      output_close (out);
+  }
 #endif
 
   exit (status);
 }
+
+#ifdef KMK
+void die(int status)
+{
+    die_with_job_output (status, NULL);
+}
+#endif

trunk/src/kmk/makeint.h

@@ -663 +663 @@
 
 void die (int) __attribute__ ((noreturn));
+void die_with_job_output (int, struct output *) __attribute__ ((noreturn));
 void pfatal_with_name (const char *) __attribute__ ((noreturn));
 void perror_with_name (const char *, const char *);

trunk/src/kmk/output.c

@@ -172 +172 @@
         release_semaphore (sem);
 
+# ifdef KMK
+      if (!out->dont_truncate)
+        { /* likely */ }
+      else return;
+# endif
+
       /* Free the segments and reset the state. */
       while ((seg = out->out.head_seg))
@@ -926 +932 @@
         release_semaphore (sem);
 
+# ifdef KMK
+      if (!out->dont_truncate)
+        { /* likely */ }
+      else return;
+# endif
       /* Truncate and reset the output, in case we use it again.  */
       if (out->out != OUTPUT_NONE)
@@ -1068 +1079 @@
 #endif
       out->syncout = !!output_sync;
+#ifdef KMK
+      out->dont_truncate = 0;
+#endif
       return;
     }

trunk/src/kmk/output.h

@@ -60 +60 @@
 #endif
     unsigned int syncout:1;     /* True if we want to synchronize output.  */
+#ifdef KMK
+    unsigned int dont_truncate:1; /* For die_with_child_output repeat.  */
+#endif
  };