Changeset 3432 for trunk/src/kmk/job.c

Timestamp:

Sep 1, 2020, 3: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).

File:

• trunk/src/kmk/job.c (modified) (3 diffs)

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