Changeset 3199 for trunk/src/kWorker/kWorker.c

Timestamp:

Mar 28, 2018, 8:56:21 PM (7 years ago)

Author:

bird

Message:

kmk,kWorker: Catch output from kWorker processes when --output-sync isn't 'none'.

File:

• trunk/src/kWorker/kWorker.c (modified) (14 diffs)

trunk/src/kWorker/kWorker.c

@@ -928 +928 @@
 
 /** Whether control-C/SIGINT or Control-Break/SIGBREAK have been seen. */
-static KBOOL volatile g_fCtrlC = K_FALSE;
+static int volatile g_rcCtrlC = 0;
+
+/** The communication pipe handle.  We break this when we see Ctrl-C such. */
+#ifdef KBUILD_OS_WINDOWS
+static HANDLE       g_hPipe = INVALID_HANDLE_VALUE;
+#else
+static int          g_hPipe = -1;
+#endif
+
 
 /* Further down. */
@@ -6657 +6665 @@
     KUPTR const idxHandle = KW_HANDLE_TO_INDEX(hFile);
     g_cWriteFileCalls++;
-    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread || g_fCtrlC);
+    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread || g_rcCtrlC != 0);
     if (idxHandle < g_Sandbox.cHandles)
     {
@@ -7368 +7376 @@
     BOOL        fRet;
     KUPTR const idxHandle = KW_HANDLE_TO_INDEX(hObject);
-    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread || g_fCtrlC);
+    kHlpAssert(GetCurrentThreadId() == g_Sandbox.idMainThread || g_rcCtrlC != 0);
     if (idxHandle < g_Sandbox.cHandles)
     {
@@ -9526 +9534 @@
 KU32 const                  g_cSandboxGetProcReplacements = K_ELEMENTS(g_aSandboxGetProcReplacements);
 
+/**
+ * Thread that is spawned by the first terminal kwSandboxCtrlHandler invocation.
+ *
+ * This will wait 5 second in a hope that the main thread will shut down the
+ * process nicly, otherwise it will terminate it forcefully.
+ */
+static DWORD WINAPI kwSandboxCtrlThreadProc(PVOID pvUser)
+{
+    int i;
+    for (i = 0; i < 10; i++)
+    {
+        Sleep(500);
+        CancelIoEx(g_hPipe, NULL);
+    }
+    TerminateProcess(GetCurrentProcess(), (int)(intptr_t)pvUser);
+    return -1;
+}
+
 
 /**
@@ -9535 +9561 @@
 static BOOL WINAPI kwSandboxCtrlHandler(DWORD dwCtrlType)
 {
+    DWORD        cbIgn;
+    int volatile rc; /* volatile for debugging */
+    int volatile rcPrev;
+    const char  *pszMsg;
     switch (dwCtrlType)
     {
         case CTRL_C_EVENT:
-            fprintf(stderr, "kWorker: Ctrl-C\n");
-            g_fCtrlC = K_TRUE;
-            exit(9);
+            rc = 9;
+            pszMsg = "kWorker: Ctrl-C\r\n";
             break;
 
         case CTRL_BREAK_EVENT:
-            fprintf(stderr, "kWorker: Ctrl-Break\n");
-            g_fCtrlC = K_TRUE;
-            exit(10);
+            rc = 10;
+            pszMsg = "kWorker: Ctrl-Break\r\n";
             break;
 
         case CTRL_CLOSE_EVENT:
-            fprintf(stderr, "kWorker: console closed\n");
-            g_fCtrlC = K_TRUE;
-            exit(11);
+            rc = 11;
+            pszMsg = "kWorker: console closed\r\n";
             break;
 
         case CTRL_LOGOFF_EVENT:
-            fprintf(stderr, "kWorker: logoff event\n");
-            g_fCtrlC = K_TRUE;
-            exit(11);
+            rc = 11;
+            pszMsg = "kWorker: logoff event\r\n";
             break;
 
         case CTRL_SHUTDOWN_EVENT:
-            fprintf(stderr, "kWorker: shutdown event\n");
-            g_fCtrlC = K_TRUE;
-            exit(11);
+            rc = 11;
+            pszMsg = "kWorker: shutdown event\r\n";
             break;
 
         default:
             fprintf(stderr, "kwSandboxCtrlHandler: %#x\n", dwCtrlType);
-            break;
-    }
+            return TRUE;
+    }
+
+    /*
+     * Terminate the process after 5 seconds.
+     *
+     * We don't want to wait here as the console server will otherwise not
+     * signal the other processes in the console, which is bad for kmk as it
+     * will continue to forge ahead.  So, the first time we get here we start
+     * a thread for doing the delayed termination.
+     *
+     * If we get here a second time we just terminate the process ourselves.
+     *
+     * Note! We do no try call exit() here as it turned out to deadlock a lot
+     *       flusing file descriptors (stderr back when we first wrote to it).
+     */
+    rcPrev = g_rcCtrlC;
+    g_rcCtrlC = rc;
+    WriteFile(GetStdHandle(STD_ERROR_HANDLE), pszMsg, (DWORD)strlen(pszMsg), &cbIgn, NULL);
+    CancelIoEx(g_hPipe, NULL); /* wake up idle main thread */
+    if (rcPrev == 0)
+    {
+        CreateThread(NULL, 0, kwSandboxCtrlThreadProc, (void*)(intptr_t)rc, 0 /*fFlags*/, NULL);
+        return TRUE;
+    }
+    TerminateProcess(GetCurrentProcess(), rc);
     return TRUE;
 }
@@ -10607 +10656 @@
     KU8 const  *pbBuf  = (KU8 const *)pvBuf;
     KU32        cbLeft = cbToWrite;
-    for (;;)
+    while (g_rcCtrlC == 0)
     {
         DWORD cbActuallyWritten = 0;
@@ -10627 +10676 @@
         }
     }
+    return -1;
 }
 
@@ -10646 +10696 @@
     KU8 *pbBuf  = (KU8 *)pvBuf;
     KU32 cbLeft = cbToRead;
-    for (;;)
+    while (g_rcCtrlC == 0)
     {
         DWORD cbActuallyRead = 0;
@@ -10671 +10721 @@
         }
     }
+    return -1;
 }
 
@@ -11238 +11289 @@
                     {
                         close(fdNul);
-                        kHlpAssert(GetStdHandle(STD_INPUT_HANDLE) != hPipe);
                         hPipe = hDuplicate;
                     }
@@ -11257 +11307 @@
         return kwErrPrintfRc(2, "The specified --pipe %p is not a pipe handle: type %#x (last err %u)!\n",
                              GetFileType(hPipe), GetLastError());
+    g_hPipe = hPipe;
 
     /*
@@ -11296 +11347 @@
                     /* The first string after the header is the command. */
                     psz = (const char *)&pbMsgBuf[sizeof(cbMsg)];
-                    if (strcmp(psz, "JOB") == 0)
+                    if (   strcmp(psz, "JOB") == 0
+                        && g_rcCtrlC == 0)
                     {
                         struct
@@ -11314 +11366 @@
                         {
                             kwSandboxCleanupLate(&g_Sandbox);
-                            continue;
+                            if (g_rcCtrlC == 0)
+                                continue;
                         }
                     }
@@ -11347 +11400 @@
         if (getenv("KWORKER_STATS") != NULL)
             kwPrintStats();
-        return rc > 0 ? 0 : 1;
+        return g_rcCtrlC != 0 ? g_rcCtrlC : rc > 0 ? 0 : 1;
     }
 }