Changeset 3169 for trunk/src/kmk/w32

Timestamp:

Mar 21, 2018, 12:27:47 PM (7 years ago)

Author:

bird

Message:

kmk/win: Run kDepObj on worker thread.

Location:

trunk/src/kmk/w32

Files:

• winchildren.c (modified) (9 diffs)
• winchildren.h (modified) (1 diff)

trunk/src/kmk/w32/winchildren.c

@@ -109 +109 @@
 #ifdef KMK
     /** kmkbuiltin command. */
-    WINCHILDTYPE_BUILTIN,
+    WINCHILDTYPE_BUILT_IN,
     /** kSubmit job. */
     WINCHILDTYPE_SUBMIT,
@@ -175 +175 @@
             HANDLE          hProcess;
         } Process;
+
+        /** Data for WINCHILDTYPE_BUILT_IN.   */
+        struct
+        {
+            /** The built-in command. */
+            PCKMKBUILTINENTRY pBuiltIn;
+            /** Number of arguments. */
+            int             cArgs;
+            /** Argument vector (single allocation, strings following array). */
+            char          **papszArgs;
+            /** Environment vector.  Only a copy if fEnvIsCopy is set. */
+            char          **papszEnv;
+        } BuiltIn;
 
         /** Data for WINCHILDTYPE_SUBMIT.   */
@@ -1643 +1656 @@
  * @param   pChild              The kSubmit child.
  */
-static void mkWinChildcareWorkerThreadHandleBuiltin(PWINCHILDCAREWORKER pWorker, PWINCHILD pChild)
-{
-    /** @todo later.    */
-__debugbreak();
+static void mkWinChildcareWorkerThreadHandleBuiltIn(PWINCHILDCAREWORKER pWorker, PWINCHILD pChild)
+{
+    PCKMKBUILTINENTRY pBuiltIn = pChild->u.BuiltIn.pBuiltIn;
+    if (pBuiltIn->uFnSignature == FN_SIG_MAIN)
+        pChild->iExitCode = pBuiltIn->u.pfnMain(pChild->u.BuiltIn.cArgs, pChild->u.BuiltIn.papszArgs, pChild->u.BuiltIn.papszEnv);
+    else if (pBuiltIn->uFnSignature == FN_SIG_MAIN_SPAWNS)
+        pChild->iExitCode = pBuiltIn->u.pfnMainSpawns(pChild->u.BuiltIn.cArgs, pChild->u.BuiltIn.papszArgs,
+                                                      pChild->u.BuiltIn.papszEnv, pChild->pMkChild, NULL);
+    else
+    {
+        assert(0);
+        pChild->iExitCode = 98;
+    }
 }
 
@@ -1760 +1782 @@
                         break;
 #ifdef KMK
-                    case WINCHILDTYPE_BUILTIN:
-                        mkWinChildcareWorkerThreadHandleBuiltin(pWorker, pChild);
+                    case WINCHILDTYPE_BUILT_IN:
+                        mkWinChildcareWorkerThreadHandleBuiltIn(pWorker, pChild);
                         break;
                     case WINCHILDTYPE_SUBMIT:
@@ -1969 +1991 @@
 
 #ifdef KMK
-
-        case WINCHILDTYPE_BUILTIN:
-            assert(0);
+        case WINCHILDTYPE_BUILT_IN:
+            if (pChild->u.BuiltIn.papszArgs)
+            {
+                free(pChild->u.BuiltIn.papszArgs);
+                pChild->u.BuiltIn.papszArgs = NULL;
+            }
+            if (pChild->u.BuiltIn.papszEnv)
+            {
+                free(pChild->u.BuiltIn.papszEnv);
+                pChild->u.BuiltIn.papszEnv = NULL;
+            }
             break;
 
@@ -1989 +2019 @@
             }
             break;
-
 #endif /* KMK */
 
@@ -2230 +2259 @@
 
 /**
+ * Interface used by kmkbuiltin.c for executing builtin commands on threads.
+ *
+ * @returns 0 on success, windows status code on failure.
+ * @param   pBuiltIn        The kmk built-in command entry.
+ * @param   cArgs           The number of arguments in papszArgs.
+ * @param   papszArgs       The argument vector.
+ * @param   papszEnv        The environment vector, optional.
+ * @param   pMkChild        The make child structure.
+ * @param   pPid            Where to return the pid.
+ */
+int MkWinChildCreateBuiltIn(PCKMKBUILTINENTRY pBuiltIn, int cArgs, char **papszArgs, char **papszEnv,
+                            struct child *pMkChild, pid_t *pPid)
+{
+    size_t    cbIgnored;
+    PWINCHILD pChild = mkWinChildNew(WINCHILDTYPE_BUILT_IN);
+    pChild->pMkChild            = pMkChild;
+    pChild->u.BuiltIn.pBuiltIn  = pBuiltIn;
+    pChild->u.BuiltIn.cArgs     = cArgs;
+    pChild->u.BuiltIn.papszArgs = mkWinChildCopyStringArray(papszArgs, &cbIgnored);
+    pChild->u.BuiltIn.papszEnv  = papszEnv ? mkWinChildCopyStringArray(papszEnv, &cbIgnored) : NULL;
+    return mkWinChildPushToCareWorker(pChild, pPid);
+}
+
+/**
  * Interface used by kSubmit.c for registering stuff to wait on.
  *
@@ -2299 +2352 @@
                     break;
 
-                case WINCHILDTYPE_BUILTIN:
+                case WINCHILDTYPE_BUILT_IN:
                     break;
 
@@ -2364 +2417 @@
             break;
 #ifdef KMK
-        case WINCHILDTYPE_BUILTIN:
+        case WINCHILDTYPE_BUILT_IN:
             break;
         case WINCHILDTYPE_SUBMIT:

trunk/src/kmk/w32/winchildren.h

@@ -27 +27 @@
 #define INCLUDED_WINCHILDREN_H
 
-void    MkWinChildInit(unsigned int cJobSlot);
-void    MkWinChildReExecMake(char **papszArgs, char **papszEnv);
+
+void    MkWinChildInit(unsigned int cJobSlot);
+void    MkWinChildReExecMake(char **papszArgs, char **papszEnv);
 intptr_t MkWinChildGetCompleteEventHandle(void);
 int     MkWinChildCreate(char **papszArgs, char **papszEnv, const char *pszShell, struct child *pMkChild, pid_t *pPid);
 int     MkWinChildCreateWithStdOutPipe(char **papszArgs, char **papszEnv, int fdErr, pid_t *pPid, int *pfdReadPipe);
+#ifdef KMK
+struct KMKBUILTINENTRY;
+int     MkWinChildCreateBuiltIn(struct KMKBUILTINENTRY const *pBuiltIn, int cArgs, char **papszArgs,
+                                char **papszEnv, struct child *pMkChild, pid_t *pPid);
 int     MkWinChildCreateSubmit(intptr_t hEvent, void *pvSubmitWorker, pid_t *pPid);
 int     MkWinChildCreateRedirect(intptr_t hProcess, pid_t *pPid);
+#endif
 int     MkWinChildKill(pid_t pid, int iSignal, struct child *pMkChild);
 int     MkWinChildWait(int fBlock, pid_t *pPid, int *piExitCode, int *piSignal, int *pfCoreDumped, struct child **ppMkChild);