Changeset 3224 in kBuild

Timestamp:

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

Author:

bird

Message:

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

Location:

trunk/src/kmk

Files:

• kmkbuiltin.h (modified) (1 diff)
• kmkbuiltin/kSubmit.c (modified) (3 diffs)
• w32/winchildren.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin.h

@@ -150 +150 @@
 #ifdef KBUILD_OS_WINDOWS
 extern int kmk_builtin_kSubmit(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx, struct child *pChild, pid_t *pPidSpawned);
-extern int kSubmitSubProcGetResult(intptr_t pvUser, int *prcExit, int *piSigNo);
+extern int kSubmitSubProcGetResult(intptr_t pvUser, int fBlock, int *prcExit, int *piSigNo);
 extern int kSubmitSubProcKill(intptr_t pvUser, int iSignal);
 extern void kSubmitSubProcCleanup(intptr_t pvUser);

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -1196 +1196 @@
  * @returns 0 on success, -1 if ReadFile was restarted.
  * @param   pvUser              The worker instance.
+ * @param   fBlock              if we're to block waiting for the result or not.
  * @param   prcExit             Where to return the exit code.
  * @param   piSigNo             Where to return the signal number.
  */
-int kSubmitSubProcGetResult(intptr_t pvUser, int *prcExit, int *piSigNo)
+int kSubmitSubProcGetResult(intptr_t pvUser, int fBlock, int *prcExit, int *piSigNo)
 {
     PWORKERINSTANCE pWorker = (PWORKERINSTANCE)pvUser;
@@ -1210 +1211 @@
      */
     DWORD cbRead = 0;
-    if (GetOverlappedResult(pWorker->hPipe, &pWorker->OverlappedRead, &cbRead, TRUE))
+    if (GetOverlappedResult(pWorker->hPipe, &pWorker->OverlappedRead, &cbRead, fBlock ? TRUE : FALSE))
     {
         pWorker->cbResultRead += cbRead;
@@ -1228 +1229 @@
     {
         DWORD dwErr = GetLastError();
+        if (dwErr == ERROR_IO_INCOMPLETE && !fBlock)
+            return -1;
         kSubmitWinReadFailed(pCtx, pWorker, dwErr, "kSubmitSubProcGetResult/result");
     }

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)