Changeset 3173 in kBuild for trunk/src/kmk/w32/w32os.c

Timestamp:

Mar 21, 2018 9:37:41 PM (7 years ago)

Author:

bird

Message:

kmkbultin: environment fixes and stats.

File:

• trunk/src/kmk/w32/w32os.c (modified) (2 diffs)

trunk/src/kmk/w32/w32os.c

@@ -187 +187 @@
     /* Build array of handles to wait for.  */
     dwHandleCount = 1 + process_set_handles (&handles[1]);
-#else
-    /* Add the completed children event as the 2nd one. */
-    handles[1] = (HANDLE)MkWinChildGetCompleteEventHandle();
-    dwHandleCount = 2;
-#endif
-
     dwEvent = WaitForMultipleObjects (
         dwHandleCount,  /* number of objects in array */
@@ -198 +192 @@
         FALSE,          /* wait for any object */
         INFINITE);      /* wait until object is signalled */
+#else
+    /* Add the completed children event as the 2nd one. */
+    handles[1] = (HANDLE)MkWinChildGetCompleteEventHandle();
+    if (handles[1] == NULL)
+      return 0;
+    dwHandleCount = 2;
+    dwEvent = WaitForMultipleObjectsEx (dwHandleCount,
+                                        handles,
+                                        FALSE /*bWaitAll*/,
+                                        256, /* INFINITE - paranoia, only wait 256 ms before checking again. */
+                                        TRUE /*bAlertable*/);
+#endif
 
     if (dwEvent == WAIT_FAILED)