Changeset 3224 for trunk/src/kmk/w32

Timestamp:

Apr 8, 2018, 5:49:07 PM (7 years ago)

Author:

bird

Message:

kmk: Fixed a couple of bugs in mkWinChildcareWorkerThreadHandleSubmit that would cause it to lock up.

File:

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

trunk/src/kmk/w32/winchildren.c

@@ -2334 +2334 @@
         assert(pChild->u.Submit.pStdErr);
         pChild->u.Submit.pStdOut->fHaveWrittenOut = FALSE;
-        ahHandles[cHandles++] = pChild->u.Submit.pStdOut->hPipeMine;
+        ahHandles[cHandles++] = pChild->u.Submit.pStdOut->hEvent;
         pChild->u.Submit.pStdErr->fHaveWrittenOut = FALSE;
-        ahHandles[cHandles++] = pChild->u.Submit.pStdErr->hPipeMine;
+        ahHandles[cHandles++] = pChild->u.Submit.pStdErr->hEvent;
     }
 
@@ -2347 +2347 @@
         int   iSignal   = -1;
         DWORD dwStatus;
-        if (cHandles == 0)
+        if (cHandles == 1)
             dwStatus = WaitForSingleObject(ahHandles[0], INFINITE);
         else
@@ -2358 +2358 @@
                 mkWinChildcareWorkerCatchOutput(pChild, pChild->u.Submit.pStdErr, FALSE /*fDraining*/);
         }
-        if (kSubmitSubProcGetResult((intptr_t)pvSubmitWorker, &iExitCode, &iSignal) == 0)
+        if (kSubmitSubProcGetResult((intptr_t)pvSubmitWorker, dwStatus == WAIT_OBJECT_0 /*fBlock*/, &iExitCode, &iSignal) == 0)
         {
             if (pChild->u.Submit.pStdOut)