Changeset 3479 for trunk/src/kmk/main.c

Timestamp:

Sep 21, 2020, 12:59:41 PM (5 years ago)

Author:

bird

Message:

kmk: Added some refinements to the recent repeat-output-from-failing-command-in-die hack.

File:

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

trunk/src/kmk/main.c

@@ -4388 +4388 @@
         {
           need_2nd_error = 1;
-          need_2nd_error_output = job_slots_used > 2
-                               && out == NULL
+          need_2nd_error_output = job_slots_used >= 2
+                               && out != NULL
                                && out != &make_sync;
+          if (need_2nd_error_output)
+            output_metered = 0;
         }
 #endif /* KMK */
@@ -4470 +4472 @@
   {
       out->dont_truncate = 0;
-      if (need_2nd_error_output)
+fprintf(stderr, "output_metered=%d\n", output_metered);
+      if (need_2nd_error_output && output_metered > 20)
         output_dump (out);
+      else
+        output_reset (out);
       output_close (out);
   }
@@ -4480 +4485 @@
 
 #ifdef KMK
-void die(int status)
+void die (int status)
 {
     die_with_job_output (status, NULL);