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

Timestamp:

Mar 28, 2018, 10:32:11 PM (7 years ago)

Author:

bird

Message:

kmk,kWorker: Some fixes wrt output capture and ctrl-c.

File:

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

trunk/src/kWorker/kWorker.c

@@ -9534 +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;
-}
-
 
 /**
@@ -9599 +9581 @@
     /*
      * 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.
      *
@@ -9613 +9589 @@
     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;
+        int i;
+        for (i = 0; i < 10; i++)
+        {
+            CancelIoEx(g_hPipe, NULL); /* wake up idle main thread */
+            Sleep(500);
+        }
     }
     TerminateProcess(GetCurrentProcess(), rc);