Changeset 2868 for trunk/src/kmk

Timestamp:

Sep 4, 2016, 3:28:12 AM (9 years ago)

Author:

bird

Message:

Only invalidate the PATH_OUT and TEMP in kWorker.

Location:

trunk/src/kmk

Files:

• dir-nt-bird.c (modified) (1 diff)
• kmkbuiltin/kSubmit.c (modified) (2 diffs)

trunk/src/kmk/dir-nt-bird.c

@@ -114 +114 @@
                 {
                     PKFSOBJ pNameObj = kFsCacheLookupRelativeToDirA(g_pFsCache, (PKFSDIR)pDirObj,
-                                                                    pszName, strlen(pszName), &enmError);
+                                                                    pszName, strlen(pszName), &enmError, NULL);
                     if (pNameObj)
                     {

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -307 +307 @@
     size_t const    cbExecutableBuf = GET_PATH_MAX;
     PATH_VAR(szExecutable);
+#define TUPLE(a_sz)     a_sz, sizeof(a_sz) - 1
+    struct variable *pVarVolatile = lookup_variable(TUPLE("PATH_OUT"));
+    if (pVarVolatile)
+    { /* likely */ }
+    else
+    {
+        pVarVolatile = lookup_variable(TUPLE("PATH_OUT_BASE"));
+        if (!pVarVolatile)
+            warn("Neither PATH_OUT_BASE nor PATH_OUT was found.");
+    }
 
     /*
@@ -373 +383 @@
                 {
                     char        szHandleArg[32];
-                    const char *apszArgs[4] = { szExecutable, "--pipe", szHandleArg, NULL };
+                    const char *apszArgs[6] =
+                    {
+                        szExecutable, "--pipe", szHandleArg,
+                        pVarVolatile ? "--volatile" : NULL, pVarVolatile ? pVarVolatile->value : NULL,
+                        NULL
+                    };
                     _snprintf(szHandleArg, sizeof(szHandleArg), "%p", hWorkerPipe);