Changeset 3432 for trunk/src/kmk/main.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/main.c (modified) (3 diffs)

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