Changeset 3199 for trunk/src/kmk/kmkbuiltin/kSubmit.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/kmk/kmkbuiltin/kSubmit.c (modified) (9 diffs)

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -110 +110 @@
     /** For overlapped read (have valid event semaphore). */
     OVERLAPPED              OverlappedRead;
+# ifdef CONFIG_NEW_WIN_CHILDREN
+    /** Standard output catcher (reused). */
+    PWINCCWPIPE             pStdOut;
+    /** Standard error catcher (reused). */
+    PWINCCWPIPE             pStdErr;
+# endif
 #else
     /** The socket descriptor we use to talk to the kWorker process. */
@@ -424 +430 @@
         wchar_t             wszPipeName[128];
         HANDLE              hWorkerPipe;
-        SECURITY_ATTRIBUTES SecAttrs = { /*nLength:*/ sizeof(SecAttrs), /*pAttrs:*/ NULL, /*bInheritHandle:*/ TRUE };
         int                 iProcessorGroup = -1; /** @todo determine process group. */
 
         /*
-         * Create the bi-directional pipe.  Worker end is marked inheritable, our end is not.
+         * Create the bi-directional pipe with overlapping I/O enabled.
          */
         if (s_fDenyRemoteClients == ~(DWORD)0)
@@ -441 +446 @@
                                        65536 /*cbInBuffer*/,
                                        0 /*cMsDefaultTimeout -> 50ms*/,
-                                       &SecAttrs /* inherit */);
+                                       NULL /* pSecAttr - no inherit */);
         if (hWorkerPipe != INVALID_HANDLE_VALUE)
         {
@@ -519 +524 @@
                         BOOL   afReplace[3] = { TRUE, FALSE, FALSE };
                         HANDLE ahReplace[3] = { hWorkerPipe, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE };
+                        if (pWorker->pStdOut)
+                        {
+                            afReplace[1] = TRUE;
+                            afReplace[2] = TRUE;
+                            ahReplace[1] = pWorker->pStdOut->hPipeChild;
+                            ahReplace[2] = pWorker->pStdErr->hPipeChild;
+                        }
+
                         rc = nt_child_inject_standard_handles(ProcInfo.hProcess, afReplace, ahReplace, szErrMsg, sizeof(szErrMsg));
                         if (rc == 0)
@@ -570 +583 @@
                     }
                     else
-                        rc = errx(pCtx, -2, "CreateProcessW failed: %u (exe=%s cmdline=%s)",
+                        rc = errx(pCtx, -2, "CreateProcessW failed: %u (exe=%S cmdline=%S)",
                                   GetLastError(), wszExecutable, wszCommandLine);
                     CloseHandle(pWorker->OverlappedRead.hEvent);
@@ -638 +651 @@
     pWorker->OverlappedRead.hEvent = INVALID_HANDLE_VALUE;
 
+    if (pWorker->pStdOut)
+        MkWinChildcareWorkerDrainPipes(NULL, pWorker->pStdOut, pWorker->pStdErr);
+
     /* It's probably shutdown already, if not give it 10 milliseconds before
        we terminate it forcefully. */
@@ -644 +660 @@
     {
         BOOL fRc = TerminateProcess(pWorker->hProcess, 127);
+
+        if (pWorker->pStdOut)
+            MkWinChildcareWorkerDrainPipes(NULL, pWorker->pStdOut, pWorker->pStdErr);
+
         rcWait = WaitForSingleObject(pWorker->hProcess, 100);
         if (rcWait != WAIT_OBJECT_0)
             warnx(pCtx, "WaitForSingleObject returns %u (and TerminateProcess %d)", rcWait, fRc);
     }
+
+    if (pWorker->pStdOut)
+        MkWinChildcareWorkerDrainPipes(NULL, pWorker->pStdOut, pWorker->pStdErr);
 
     if (!CloseHandle(pWorker->hProcess))
@@ -719 +742 @@
     pWorker = (PWORKERINSTANCE)xcalloc(sizeof(*pWorker));
     pWorker->cBits = cBitsWorker;
-    if (kSubmitSpawnWorker(pCtx, pWorker, cVerbosity) == 0)
-    {
-        /*
-         * Insert it into the process ID hash table and idle list.
-         */
-        size_t idxHash = KWORKER_PID_HASH(pWorker->pid);
-        pWorker->pNextPidHash = g_apPidHash[idxHash];
-        g_apPidHash[idxHash] = pWorker;
-
-        kSubmitListAppend(&g_IdleList, pWorker);
-        return pWorker;
-    }
+#if defined(CONFIG_NEW_WIN_CHILDREN) && defined(KBUILD_OS_WINDOWS)
+    if (output_sync != OUTPUT_SYNC_NONE)
+    {
+        pWorker->pStdOut = MkWinChildcareCreateWorkerPipe(1, g_uWorkerSeqNo << 1);
+        pWorker->pStdErr = MkWinChildcareCreateWorkerPipe(2, g_uWorkerSeqNo << 1);
+    }
+    if (   output_sync == OUTPUT_SYNC_NONE
+        || (   pWorker->pStdOut != NULL
+            && pWorker->pStdErr != NULL))
+#endif
+    {
+        if (kSubmitSpawnWorker(pCtx, pWorker, cVerbosity) == 0)
+        {
+            /*
+             * Insert it into the process ID hash table and idle list.
+             */
+            size_t idxHash = KWORKER_PID_HASH(pWorker->pid);
+            pWorker->pNextPidHash = g_apPidHash[idxHash];
+            g_apPidHash[idxHash] = pWorker;
+
+            kSubmitListAppend(&g_IdleList, pWorker);
+            return pWorker;
+        }
+    }
+#if defined(CONFIG_NEW_WIN_CHILDREN) && defined(KBUILD_OS_WINDOWS)
+    if (pWorker->pStdErr)
+        MkWinChildcareDeleteWorkerPipe(pWorker->pStdErr);
+    if (pWorker->pStdOut)
+        MkWinChildcareDeleteWorkerPipe(pWorker->pStdOut);
+#endif
 
     free(pWorker);
@@ -1109 +1150 @@
         }
 # else
-        if (MkWinChildCreateSubmit((intptr_t)pWorker->OverlappedRead.hEvent, pWorker, pPidSpawned) == 0)
+        if (MkWinChildCreateSubmit((intptr_t)pWorker->OverlappedRead.hEvent, pWorker,
+                                   pWorker->pStdOut, pWorker->pStdErr, pPidSpawned) == 0)
         { /* likely */ }
         else