Changeset 3173 for trunk/src/kmk/w32

Timestamp:

Mar 21, 2018, 10:37:41 PM (8 years ago)

Author:

bird

Message:

kmkbultin: environment fixes and stats.

Location:

trunk/src/kmk/w32

Files:

• w32os.c (modified) (2 diffs)
• winchildren.c (modified) (1 diff)

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)

trunk/src/kmk/w32/winchildren.c

@@ -2536 +2536 @@
  * that completed children is the typical source of these tokens (esp. for kmk).
  *
- * @returns Event handle.
+ * @returns Zero if completed children, event handle if waiting is required.
  */
 intptr_t MkWinChildGetCompleteEventHandle(void)
 {
-    return (intptr_t)g_hEvtWaitChildren;
+    /* We don't return the handle if we've got completed children.  This
+       is a safe guard against being called twice in a row without any
+       MkWinChildWait call inbetween. */
+    if (!g_pTailCompletedChildren)
+        return (intptr_t)g_hEvtWaitChildren;
+    return 0;
 }