Changeset 3156 for trunk/src/kmk/kmkbuiltin

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.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• kSubmit.c (modified) (3 diffs)
• redirect.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -51 +51 @@
 #endif
 #ifdef KBUILD_OS_WINDOWS
-# include "sub_proc.h"
+# ifndef CONFIG_NEW_WIN_CHILDREN
+#  include "sub_proc.h"
+# else
+#  include "../w32/winchildren.h"
+# endif
 #endif
 
@@ -933 +937 @@
     if (rc == -1)
     {
+# ifndef CONFIG_NEW_WIN_CHILDREN
         if (process_kmk_register_submit(pWorker->OverlappedRead.hEvent, (intptr_t)pWorker, pPidSpawned) == 0)
         { /* likely */ }
@@ -942 +947 @@
             goto l_again;
         }
+# else
+        if (MkWinChildCreateSubmit((intptr_t)pWorker->OverlappedRead.hEvent, pWorker, pPidSpawned) == 0)
+        { /* likely */ }
+        else
+        {
+            /* We need to do the waiting here because sub_proc.c has too much to do. */
+            warnx("MkWinChildCreateSubmit failed!");
+            WaitForSingleObject(pWorker->OverlappedRead.hEvent, INFINITE);
+            goto l_again;
+        }
+# endif
     }
     else

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -70 +70 @@
 #include "kmkbuiltin.h"
 #ifdef KMK
+# include "job.h"
+# include "variable.h"
 # ifdef KBUILD_OS_WINDOWS
-#  include "sub_proc.h"
+#  ifndef CONFIG_NEW_WIN_CHILDREN
+#   include "sub_proc.h"
+#  else
+#   include "../w32/winchildren.h"
+#  endif
 #  include "pathstuff.h"
 # endif
-# include "job.h"
-# include "variable.h"
 #endif
 
@@ -888 +892 @@
                 if ((intptr_t)hProcess != -1)
                 {
+# ifndef CONFIG_NEW_WIN_CHILDREN
                     if (process_kmk_register_redirect(hProcess, pPidSpawned) == 0)
+# else
+                    if (MkWinChildCreateRedirect((intptr_t)hProcess, pPidSpawned) == 0)
+# endif
                     {
                         if (cVerbosity > 0)
@@ -896 +904 @@
                     {
                         DWORD dwTmp;
+# ifndef CONFIG_NEW_WIN_CHILDREN
                         warn("sub_proc is out of slots, waiting for child...");
+# else
+                        warn("MkWinChildCreateRedirect failed...");
+# endif
                         dwTmp = WaitForSingleObject(hProcess, INFINITE);
                         if (dwTmp != WAIT_OBJECT_0)