Changeset 3413 for trunk/src/kmk

Timestamp:

Aug 20, 2020, 10:20:15 AM (5 years ago)

Author:

bird

Message:

kmk/kSubmit: Only dump history when asked to.

File:

• trunk/src/kmk/kmkbuiltin/kSubmit.c (modified) (7 diffs)

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -122 +122 @@
 #endif
 
+    /** --debug-dump-history-on-failure.   */
+    int                     fDebugDumpHistoryOnFailure;
     /** Current history index (must mod with aHistory element count). */
     unsigned                iHistory;
@@ -1552 +1554 @@
         case STATUS_ILLEGAL_INSTRUCTION:        *piSigNo = SIGILL; break;
     }
-    if (pWorker->Result.s.rcExit && 1)
+    if (pWorker->Result.s.rcExit && pWorker->fDebugDumpHistoryOnFailure)
         kSubmitDumpHistory(pCtx, pWorker);
     if (pWorker->Result.s.bWorkerExiting)
@@ -1758 +1760 @@
                            "    More verbose execution.\n"
                            "  --debug-dump-history\n"
-                           "    Dump the history as of the submitted command.  Handy for debuging\n"
+                           "    Dump the history as of the submitted command.  Handy for debugging\n"
                            "    trouble caused by a previous job.\n"
+                           "  --debug-dump-history-on-failure, --no-debug-dump-history-on-failure\n"
+                           "    Dump the history on failure.  Can also be enabled by a non-empty\n"
+                           "    KMK_KSUBMIT_DUMP_HISTORY_ON_FAILURE variable (first invocation only).\n"
                            "  -P|--post-cmd <cmd> ...\n"
                            "    For running a built-in command on the output, specifying the command\n"
@@ -1793 +1798 @@
     int             fNoPchCaching       = 0;
     int             fDebugDumpHistory   = 0;
+    static int      s_fDebugDumpHistoryOnFailure = -1;
+    int             fDebugDumpHistoryOnFailure = s_fDebugDumpHistoryOnFailure;
     int             cVerbosity          = 0;
     size_t const    cbCwdBuf            = GET_PATH_MAX;
@@ -1813 +1820 @@
     }
 #endif
+    if (fDebugDumpHistoryOnFailure != -1)
+    { /* likely */ }
+    else
+    {
+        struct variable *pVar = lookup_variable(TUPLE("KMK_KSUBMIT_DUMP_HISTORY_ON_FAILURE"));
+        fDebugDumpHistoryOnFailure = pVar && *pVar->value != '\0';
+        s_fDebugDumpHistoryOnFailure = fDebugDumpHistoryOnFailure;
+    }
 
     /*
@@ -1880 +1895 @@
                 }
 
+                if (strcmp(pszArg, "debug-dump-history-on-failure") == 0)
+                {
+                    fDebugDumpHistoryOnFailure = 1;
+                    continue;
+                }
+
+                if (strcmp(pszArg, "no-debug-dump-history-on-failure") == 0)
+                {
+                    fDebugDumpHistoryOnFailure = 0;
+                    continue;
+                }
 
                 /* convert to short. */
@@ -2061 +2087 @@
 #endif
                 output_dump(pCtx->pOut);
+            pWorker->fDebugDumpHistoryOnFailure = fDebugDumpHistoryOnFailure;
             rcExit = kSubmitSendJobMessage(pCtx, pWorker, pvMsg, cbMsg, 0 /*fNoRespawning*/, cVerbosity);
             if (rcExit == 0)