Changeset 3224 for trunk/src/kmk/kmkbuiltin/kSubmit.c

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/kmkbuiltin/kSubmit.c (modified) (3 diffs)

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");
     }