Changeset 3156 for trunk/src/kmk/job.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/job.c (modified) (16 diffs)

trunk/src/kmk/job.c

@@ -117 +117 @@
 # include <io.h>
 # include <process.h>
-# include "sub_proc.h"
+# ifdef CONFIG_NEW_WIN_CHILDREN
+#  include "w32/winchildren.h"
+# else
+#  include "sub_proc.h"
+# endif
 # include "w32err.h"
 # include "pathstuff.h"
@@ -262 +266 @@
 
 #ifdef WINDOWS32
+# ifndef CONFIG_NEW_WIN_CHILDREN /* (only used by commands.c) */
 /*
  * The macro which references this function is defined in makeint.h.
@@ -270 +275 @@
   return ((process_kill ((HANDLE)pid, sig) == TRUE) ? 0 : -1);
 }
+# endif /* !CONFIG_NEW_WIN_CHILDREN */
 
 /* This function creates a temporary file name with an extension specified
@@ -807 +813 @@
 #endif /* _AMIGA */
 #ifdef WINDOWS32
+# ifndef CONFIG_NEW_WIN_CHILDREN
           {
             HANDLE hPID;
@@ -869 +876 @@
             pid = (pid_t) hPID;
           }
+# else  /* CONFIG_NEW_WIN_CHILDREN */
+          assert (!any_remote);
+          pid = 0;
+          coredump = exit_sig = exit_code = 0;
+          {
+            int rc = MkWinChildWait(block, &pid, &exit_code, &exit_sig, &coredump, &c);
+            if (rc != 0)
+                  ON (fatal, NILF, _("MkWinChildWait: %u"), rc);
+          }
+          if (pid == 0)
+            {
+              /* No more children, stop. */
+              reap_more = 0;
+              break;
+            }
+
+          /* If we have started jobs in this second, remove one.  */
+          if (job_counter)
+            --job_counter;
+# endif /* CONFIG_NEW_WIN_CHILDREN */
 #endif /* WINDOWS32 */
         }
@@ -1656 +1683 @@
 #ifdef WINDOWS32
   {
+#  ifndef CONFIG_NEW_WIN_CHILDREN
       HANDLE hPID;
       char* arg0;
@@ -1699 +1727 @@
           goto error;
         }
+#  else   /* CONFIG_NEW_WIN_CHILDREN */
+    struct variable *shell_var = lookup_variable("SHELL", 5);
+    const char *shell_value = !shell_var ? NULL
+                            : !shell_var->recursive || strchr(shell_var->value, '$') == NULL
+                            ? shell_var->value : variable_expand (shell_var->value);
+    int rc = MkWinChildCreate(argv, child->environment, shell_value, child, &child->pid);
+    if (rc != 0)
+      {
+        int i;
+        unblock_sigs ();
+        fprintf (stderr, _("failed to launch process (rc=%d)\n"), rc);
+        for (i = 0; argv[i]; i++)
+          fprintf (stderr, "%s ", argv[i]);
+        fprintf (stderr, "\n", argv[i]);
+        goto error;
+      }
+#endif  /* CONFIG_NEW_WIN_CHILDREN */
   }
 #endif /* WINDOWS32 */
@@ -1771 +1816 @@
 #endif
 #ifdef WINDOWS32
+# ifndef CONFIG_NEW_WIN_CHILDREN
           || (process_used_slots () >= MAXIMUM_WAIT_OBJECTS)
+# endif
 #endif
           ))
@@ -2193 +2240 @@
   time_t now;
 
-#ifdef WINDOWS32
+#if defined(WINDOWS32) && !defined(CONFIG_NEW_WIN_CHILDREN)
   /* sub_proc.c cannot wait for more than MAXIMUM_WAIT_OBJECTS children */
   if (process_used_slots () >= MAXIMUM_WAIT_OBJECTS)
@@ -2436 +2483 @@
 
 
+#if !defined(WINDOWS32) || !defined(CONFIG_NEW_WIN_CHILDREN)
 #ifndef _AMIGA
 /* Replace the current process with one running the command in ARGV,
@@ -2459 +2507 @@
 #else
 #ifdef WINDOWS32
+# ifndef CONFIG_NEW_WIN_CHILDREN
   HANDLE hPID;
   HANDLE hWaitPID;
@@ -2514 +2563 @@
   /* return child's exit code as our exit code */
   exit (exit_code);
-
+# else  /* CONFIG_NEW_WIN_CHILDREN */
+
+# endif /* CONFIG_NEW_WIN_CHILDREN */
 #else  /* !WINDOWS32 */
 
@@ -2648 +2699 @@
 
 #endif /* On Amiga */
+#endif /* !defined(WINDOWS32) || !defined(CONFIG_NEW_WIN_CHILDREN) */
 
 
@@ -2777 +2829 @@
 
   const char *sh_chars;
-  const char **sh_cmds;
+  char const * const * sh_cmds;                                                /* kmk: +_sh +const*2 */
 #elif defined(__riscos__)
   static const char *sh_chars = "";
@@ -3330 +3382 @@
                 /* This is the start of a new recipe line.  Skip whitespace
                    and prefix characters but not newlines.  */
+#ifndef CONFIG_WITH_COMMANDS_FUNC
                 while (ISBLANK (*f) || *f == '-' || *f == '@' || *f == '+')
+#else
+                char ch;
+                while (ISBLANK ((ch = *f)) || ch == '-' || ch == '@' || ch == '+' || ch == '%')
+#endif
                   ++f;
 
@@ -3382 +3439 @@
                 /* This is the start of a new recipe line.  Skip whitespace
                    and prefix characters but not newlines.  */
+#ifndef CONFIG_WITH_COMMANDS_FUNC
                 while (ISBLANK (*f) || *f == '-' || *f == '@' || *f == '+')
+#else
+                char ch;
+                while (ISBLANK ((ch = *f)) || ch == '-' || ch == '@' || ch == '+' || ch == '%')
+#endif
                   ++f;