Changeset 2844 for trunk/src/kmk

Timestamp:

Aug 29, 2016, 6:31:33 PM (9 years ago)

Author:

bird

Message:

kSubmit/kWorker: updates

Location:

trunk/src/kmk

Files:

• Makefile.kmk (modified) (1 diff)
• job.c (modified) (3 diffs)
• kmkbuiltin.h (modified) (2 diffs)
• kmkbuiltin/kSubmit.c (modified) (14 diffs)
• w32/include/sub_proc.h (modified) (1 diff)
• w32/subproc/sub_proc.c (modified) (2 diffs)

trunk/src/kmk/Makefile.kmk

@@ -88 +88 @@
         kmkbuiltin/setmode.c \
         kmkbuiltin/strmode.c \
-        kmkbuiltin/kbuild_version.c \
         kmkbuiltin/kbuild_protection.c \
         getopt.c \

trunk/src/kmk/job.c

@@ -1318 +1318 @@
       assert (*p2);
       set_command_state (child->file, cs_running);
+      child->deleted = 0;
       child->pid = 0;
       if (p2 != argv)
-        rc = kmk_builtin_command (*p2, &argv_spawn, &child->pid, child);
+        rc = kmk_builtin_command (*p2, child, &argv_spawn, &child->pid);
       else
         {
@@ -1326 +1327 @@
           while (argv[argc])
             argc++;
-          rc = kmk_builtin_command_parsed (argc, argv, &argv_spawn, &child->pid, child);
+          rc = kmk_builtin_command_parsed (argc, argv, child, &argv_spawn, &child->pid);
         }
 
@@ -1334 +1335 @@
 # endif
 
-      /* synchronous command execution? */
-      if (!rc && !argv_spawn)
-        goto next_command;
-
-      /* spawned a child? */
-      if (!rc && child->pid)
+      if (!rc)
         {
-          ++job_counter;
-          return;
+          /* spawned a child? */
+          if (child->pid)
+            {
+              ++job_counter;
+              return;
+            }
+
+          /* synchronous command execution? */
+          if (!argv_spawn)
+            goto next_command;
         }
 

trunk/src/kmk/kmkbuiltin.h

@@ -35 +35 @@
 #endif
 
+#include "kbuild_version.h"
+
 int kmk_builtin_command(const char *pszCmd, struct child *pChild, char ***ppapszArgvToSpawn, pid_t *pPidSpawned);
 int kmk_builtin_command_parsed(int argc, char **argv, struct child *pChild, char ***ppapszArgvToSpawn, pid_t *pPidSpawned);
@@ -69 +71 @@
 extern char *kmk_builtin_func_printf(char *o, char **argv, const char *funcname);
 
-extern int kbuild_version(const char *);
-
 #endif
 

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -52 +52 @@
 #ifdef KBUILD_OS_WINDOWS
 # include "sub_proc.h"
+# include "quote_argv.h"
 #endif
 
@@ -366 +367 @@
                 if (pWorker->OverlappedRead.hEvent != NULL)
                 {
-                    char        szHandleArg[16];
+                    char        szHandleArg[32];
                     const char *apszArgs[4] = { szExecutable, "--pipe", szHandleArg, NULL };
                     _snprintf(szHandleArg, sizeof(szHandleArg), "%p", hWorkerPipe);
@@ -557 +558 @@
                                       const char *pszCwd, uint32_t *pcbMsg)
 {
-    size_t   i;
     size_t   cbTmp;
+    uint32_t i;
     uint32_t cbMsg;
+    uint32_t cArgs;
+    uint32_t cEnvVars;
     uint8_t *pbMsg;
     uint8_t *pbCursor;
+
+    /*
+     * Adjust input.
+     */
+    if (!pszExecutable)
+        pszExecutable = papszArgs[0];
 
     /*
@@ -569 +578 @@
     cbMsg += sizeof("JOB");
     cbMsg += strlen(pszExecutable) + 1;
-
+    cbMsg += strlen(pszCwd) + 1;
+
+    cbMsg += sizeof(cArgs);
     for (i = 0; papszArgs[i] != NULL; i++)
-        cbMsg += strlen(papszArgs[i]) + 1;
-    cbMsg += 1;
-
+        cbMsg += 1 + strlen(papszArgs[i]) + 1;
+    cArgs  = i;
+
+    cbMsg += sizeof(cArgs);
     for (i = 0; papszEnvVars[i] != NULL; i++)
         cbMsg += strlen(papszEnvVars[i]) + 1;
-    cbMsg += 1;
-
-    cbMsg += strlen(pszCwd) + 1;
+    cEnvVars = i;
+
 
     /*
@@ -594 +605 @@
     pbCursor += cbTmp;
 
+    cbTmp = strlen(pszCwd) + 1;
+    memcpy(pbCursor, pszCwd, cbTmp);
+    pbCursor += cbTmp;
+
+    memcpy(pbCursor, &cArgs, sizeof(cArgs));
+    pbCursor += sizeof(cArgs);
     for (i = 0; papszArgs[i] != NULL; i++)
     {
+        *pbCursor++ = 0; /* Argument expansion flags (MSC, EMX). */
         cbTmp = strlen(papszArgs[i]) + 1;
         memcpy(pbCursor, papszArgs[i], cbTmp);
         pbCursor += cbTmp;
     }
-    *pbCursor++ = '\0';
-
+    assert(i == cArgs);
+
+    memcpy(pbCursor, &cEnvVars, sizeof(cEnvVars));
+    pbCursor += sizeof(cEnvVars);
     for (i = 0; papszEnvVars[i] != NULL; i++)
     {
@@ -608 +628 @@
         pbCursor += cbTmp;
     }
-    *pbCursor++ = '\0';
-
-    cbTmp = strlen(pszCwd) + 1;
-    memcpy(pbCursor, pszCwd, cbTmp);
-    pbCursor += cbTmp;
+    assert(i == cEnvVars);
 
     assert(pbCursor - pbMsg == (size_t)cbMsg);
@@ -780 +796 @@
 /**
  * Used by
- * @returns 0 if we got the whole result, -1 if I/O is pending, windows last
+ * @returns 0 if we got the whole result, -1 if I/O is pending, and windows last
  *          error on ReadFile failure.
  * @param   pWorker             The worker instance.
@@ -806 +822 @@
             DWORD dwErr = GetLastError();
             if (dwErr == ERROR_IO_PENDING)
-                return 1;
-            return kSubmitWinReadFailed(pWorker, GetLastError());
+                return -1;
+            return kSubmitWinReadFailed(pWorker, dwErr);
         }
 
@@ -849 +865 @@
     if (rc == -1)
     {
-        if (process_kmk_register_submit(pWorker->OverlappedRead.hEvent, (intptr_t)pWorker) == 0)
+        if (process_kmk_register_submit(pWorker->OverlappedRead.hEvent, (intptr_t)pWorker, pPidSpawned) == 0)
         { /* likely */ }
         else
@@ -873 +889 @@
      */
     pWorker->pBusyWith = pChild;
+#ifndef KBUILD_OS_WINDOWS
     *pPidSpawned = pWorker->pid;
+#endif
 
     kSubmitListUnlink(&g_IdleList, pWorker);
@@ -977 +995 @@
         PWORKERINSTANCE apWorkers[MAXIMUM_WAIT_OBJECTS];
         HANDLE          ahHandles[MAXIMUM_WAIT_OBJECTS];
-        DWORD           cHandles;
+        DWORD           cHandles = 0;
 
         for (pWorker = g_IdleList.pHead; pWorker != NULL; pWorker = pWorker->pNext)
@@ -1329 +1347 @@
 
     papszEnv = pChild->environment;
-    if (papszEnv)
+    if (!papszEnv)
         pChild->environment = papszEnv = target_environment(pChild->file);
     cEnvVars = 0;
@@ -1495 +1513 @@
         if (pWorker)
         {
+#ifdef KBUILD_OS_WINDOWS
+            /* Quote the argv elements, but first we need unquoted pszExecute. */
+            char *pszFreeExec = NULL;
+            if (!pszExecutable)
+                pszExecutable = pszFreeExec = xstrdup(argv[0]);
+            quote_argv(argc, argv, fWatcomBrainDamage, 1 /*fFreeOrLeak*/);
+#endif
+
             rcExit = kSubmitSendJobMessage(pWorker, pvMsg, cbMsg, 0 /*fNoRespawning*/, cVerbosity);
             if (rcExit == 0)
@@ -1502 +1528 @@
                 if (atexit(kSubmitAtExitCallback) == 0)
                     g_fAtExitRegistered = 1;
+
+#ifdef KBUILD_OS_WINDOWS
+            free(pszFreeExec);
+#endif
         }
         else

trunk/src/kmk/w32/include/sub_proc.h

@@ -49 +49 @@
 EXTERN_DECL(int process_used_slots, (VOID_DECL));
 #ifdef KMK
-EXTERN_DECL(int process_kmk_register_submit, (HANDLE hEvent, intptr_t clue));
+EXTERN_DECL(int process_kmk_register_submit, (HANDLE hEvent, intptr_t clue, pid_t *pPid));
 #endif
 

trunk/src/kmk/w32/subproc/sub_proc.c

@@ -206 +206 @@
  * @param   hEvent              The event semaphore to wait on.
  * @param   clue                The clue to base.
+ * @param   pPid                Where to return the pid that job.c expects.
  */
 int
-process_kmk_register_submit(HANDLE hEvent, intptr_t clue)
+process_kmk_register_submit(HANDLE hEvent, intptr_t clue, pid_t *pPid)
 {
         if (proc_index < MAXIMUM_WAIT_OBJECTS) {
@@ -217 +218 @@
 
                 proc_array[proc_index++] = pSubProc;
+                *pPid = (HANDLE)pSubProc;
                 return 0;
         }