Changeset 3156 for trunk/src/kmk/w32/w32os.c

Timestamp:

Mar 18, 2018, 9:10:03 PM (7 years ago)

Author:

bird

Message:

kmk/win: Reworking child process handling. This effort will hopefully handle processor groups better and allow executing internal function off the main thread.

File:

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

trunk/src/kmk/w32/w32os.c

@@ -24 +24 @@
 #include <io.h>
 #include "pathstuff.h"
-#include "sub_proc.h"
+#ifndef CONFIG_NEW_WIN_CHILDREN
+# include "sub_proc.h"
+#else
+# include "winchildren.h"
+#endif
 #include "w32err.h"
 #include "os.h"
@@ -169 +173 @@
 jobserver_acquire (int timeout)
 {
+#ifndef CONFIG_NEW_WIN_CHILDREN
     HANDLE handles[MAXIMUM_WAIT_OBJECTS + 1]; /* bird: + 1 to prevent trashing the stack. */
+#else
+    HANDLE handles[2];
+#endif
     DWORD dwHandleCount;
     DWORD dwEvent;
@@ -176 +184 @@
     handles[0] = jobserver_semaphore;
 
+#ifndef CONFIG_NEW_WIN_CHILDREN
     /* 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 (