Changeset 2884

Timestamp:

Sep 6, 2016, 5:11:19 AM (9 years ago)

Author:

bird

Message:

fixes

Location:

trunk/src

Files:

• kWorker/kWorker.c (modified) (1 diff)
• kmk/kmkbuiltin/kSubmit.c (modified) (1 diff)

trunk/src/kWorker/kWorker.c

@@ -7335 +7335 @@
                 rc = kwErrPrintfRc(-1, "Bogus message length: %u (%#x)\n", cbMsg, cbMsg);
         }
-        FlushFileBuffers(hPipe);
+
+        /*
+         * If we're exitting because we're restarting, we need to delay till
+         * kmk/kSubmit has read the result.  Windows documentation says it
+         * immediately discards pipe buffers once the pipe is broken by the
+         * server (us).  So, We flush the buffer and queues a 1 byte read
+         * waiting for kSubmit to close the pipe when it receives the
+         * bExiting = K_TRUE result.
+         */
+        if (g_fRestart)
+        {
+            KU8 b;
+            FlushFileBuffers(hPipe);
+            ReadFile(hPipe, &b, 1, &cbMsg, NULL);
+        }
+
         CloseHandle(hPipe);
         return rc > 0 ? 0 : 1;

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -979 +979 @@
         case STATUS_ILLEGAL_INSTRUCTION:        *piSigNo = SIGILL; break;
     }
+    if (pWorker->Result.s.bWorkerExiting)
+        kSubmitCloseConnectOnExitingWorker(pWorker);
 
     return 0;