Changeset 3173 in kBuild for trunk/src/kmk/kmkbuiltin.c

Timestamp:

Mar 21, 2018 9:37:41 PM (7 years ago)

Author:

bird

Message:

kmkbultin: environment fixes and stats.

File:

• trunk/src/kmk/kmkbuiltin.c (modified) (12 diffs)

trunk/src/kmk/kmkbuiltin.c

@@ -5 +5 @@
 
 /*
- * Copyright (c) 2005-2010 knut st. osmundsen <[email protected]>
+ * Copyright (c) 2005-2018 knut st. osmundsen <[email protected]>
  *
  * This file is part of kBuild.
@@ -24 +24 @@
  */
 
-/*******************************************************************************
-*   Header Files                                                               *
-*******************************************************************************/
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <string.h>
 #include <stdlib.h>
@@ -39 +40 @@
 #include "makeint.h"
 #include "job.h"
+#include "variable.h"
 #if defined(KBUILD_OS_WINDOWS) && defined(CONFIG_NEW_WIN_CHILDREN)
 # include "w32/winchildren.h"
@@ -48 +50 @@
 extern char **environ;
 #endif
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+#ifdef CONFIG_WITH_KMK_BUILTIN_STATS
+extern int print_stats_flag;
+#endif
+
 
 
@@ -234 +245 @@
 static const KMKBUILTINENTRY g_aBuiltIns[] =
 {
-#define BUILTIN_ENTRY(a_fn, a_sz, a_uFnSignature, fMpSafe, fNeedEnv) \
+#define BUILTIN_ENTRY(a_fn, a_sz, a_uFnSignature, fMtSafe, fNeedEnv) \
     {  { { sizeof(a_sz) - 1, a_sz, } }, \
-       (uintptr_t)a_fn,                                 a_uFnSignature,   fMpSafe, fNeedEnv }
+       (uintptr_t)a_fn,                                 a_uFnSignature,   fMtSafe, fNeedEnv }
 
     /* More frequently used commands: */
@@ -245 +256 @@
     BUILTIN_ENTRY(kmk_builtin_kDepObj,  "kDepObj",      FN_SIG_MAIN,            1, 0),
 #ifdef KBUILD_OS_WINDOWS
-    BUILTIN_ENTRY(kmk_builtin_kSubmit,  "kSubmit",      FN_SIG_MAIN_SPAWNS,     0, 0),
+    BUILTIN_ENTRY(kmk_builtin_kSubmit,  "kSubmit",      FN_SIG_MAIN_SPAWNS,     0, 1),
 #endif
     BUILTIN_ENTRY(kmk_builtin_mkdir,    "mkdir",        FN_SIG_MAIN,            0, 0),
     BUILTIN_ENTRY(kmk_builtin_mv,       "mv",           FN_SIG_MAIN,            0, 0),
-    BUILTIN_ENTRY(kmk_builtin_redirect, "redirect",     FN_SIG_MAIN_SPAWNS,     0, 1),
+    BUILTIN_ENTRY(kmk_builtin_redirect, "redirect",     FN_SIG_MAIN_SPAWNS,     1, 1),
     BUILTIN_ENTRY(kmk_builtin_rm,       "rm",           FN_SIG_MAIN,            0, 1),
     BUILTIN_ENTRY(kmk_builtin_rmdir,    "rmdir",        FN_SIG_MAIN,            0, 0),
@@ -347 +358 @@
                 /*
                  * That's a match!
+                 *
+                 * First get the environment if it is actually needed.  This is
+                 * especially important when we run on a worker thread as it must
+                 * not under any circumstances do stuff like target_environment.
                  */
-                int rc;
+                int    rc;
+                char **papszEnvVars = NULL;
+                if (pEntry->fNeedEnv)
+                {
+                    papszEnvVars = pChild->environment;
+                    if (!papszEnvVars)
+                        pChild->environment = papszEnvVars = target_environment(pChild->file);
+                }
+
 #if defined(KBUILD_OS_WINDOWS) && defined(CONFIG_NEW_WIN_CHILDREN)
-                if (pEntry->fMpSafe)
-                {
-                    rc = MkWinChildCreateBuiltIn(pEntry, argc, argv, pEntry->fNeedEnv ? pChild->environment : NULL,
-                                                 pChild, pPidSpawned);
+                /*
+                 * If the built-in is multi thread safe, we will run it on a job slot thread.
+                 */
+                if (pEntry->fMtSafe)
+                {
+                    rc = MkWinChildCreateBuiltIn(pEntry, argc, argv, papszEnvVars, pChild, pPidSpawned);
 # ifdef CONFIG_WITH_KMK_BUILTIN_STATS
                     g_aBuiltInStats[pEntry - &g_aBuiltIns[0]].cAsyncTimes++;
@@ -361 +386 @@
 #endif
                 {
-                    char **envp = pChild->environment ? pChild->environment : environ;
-
                     /*
                      * Call the worker function, making sure to preserve umask.
                      */
 #ifdef CONFIG_WITH_KMK_BUILTIN_STATS
-                    big_int nsStart = nano_timestamp();
+                    big_int nsStart = print_stats_flag ? nano_timestamp() : 0;
 #endif
                     int const iUmask = umask(0);        /* save umask */
@@ -373 +396 @@
 
                     if (pEntry->uFnSignature == FN_SIG_MAIN)
-                        rc = pEntry->u.pfnMain(argc, argv, envp);
+                        rc = pEntry->u.pfnMain(argc, argv, papszEnvVars);
                     else if (pEntry->uFnSignature == FN_SIG_MAIN_SPAWNS)
-                        rc = pEntry->u.pfnMainSpawns(argc, argv, envp, pChild, pPidSpawned);
+                        rc = pEntry->u.pfnMainSpawns(argc, argv, papszEnvVars, pChild, pPidSpawned);
                     else if (pEntry->uFnSignature == FN_SIG_MAIN_TO_SPAWN)
                     {
@@ -383 +406 @@
                          * problem then (the call stack shows what's been going on).
                          */
-                        rc = pEntry->u.pfnMainToSpawn(argc, argv, envp, ppapszArgvToSpawn);
+                        rc = pEntry->u.pfnMainToSpawn(argc, argv, papszEnvVars, ppapszArgvToSpawn);
                         if (   !rc
                             && *ppapszArgvToSpawn
@@ -410 +433 @@
 
 #ifdef CONFIG_WITH_KMK_BUILTIN_STATS
-                    g_aBuiltInStats[pEntry - &g_aBuiltIns[0]].cTimes++;
-                    g_aBuiltInStats[pEntry - &g_aBuiltIns[0]].cNs += nano_timestamp() - nsStart;
+                    if (print_stats_flag)
+                    {
+                        uintptr_t iEntry = pEntry - &g_aBuiltIns[0];
+                        g_aBuiltInStats[iEntry].cTimes++;
+                        g_aBuiltInStats[iEntry].cNs += nano_timestamp() - nsStart;
+                    }
 #endif
                 }
@@ -442 +469 @@
 extern void kmk_builtin_print_stats(FILE *pOutput, const char *pszPrefix)
 {
-    const unsigned  cEntries = sizeof(g_aBuiltInStats) / sizeof(g_aBuiltInStats[0]);
+    const unsigned cEntries = sizeof(g_aBuiltInStats) / sizeof(g_aBuiltInStats[0]);
     unsigned i;
+    assert(print_stats_flag);
     fprintf(pOutput, "\n%skmk built-in command statistics:\n", pszPrefix);
     for (i = 0; i < cEntries; i++)