Changeset 2868 for trunk/src/kWorker/kWorker.c

Timestamp:

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

Author:

bird

Message:

Only invalidate the PATH_OUT and TEMP in kWorker.

File:

• trunk/src/kWorker/kWorker.c (modified) (4 diffs)

trunk/src/kWorker/kWorker.c

@@ -4716 +4716 @@
 
     /*
-     * Invalidate the missing cache entries.
+     * Invalidate the volatile parts of cache (kBuild output directory,
+     * temporary directory, whatever).
      */
-    kFsCacheInvalidateMissing(g_pFsCache);
+    kFsCacheInvalidateCustomBoth(g_pFsCache);
     return 0;
 }
@@ -5234 +5235 @@
 int main(int argc, char **argv)
 {
-    KSIZE   cbMsgBuf = 0;
-    KU8    *pbMsgBuf = NULL;
-    int     i;
-    HANDLE  hPipe = INVALID_HANDLE_VALUE;
+    KSIZE           cbMsgBuf = 0;
+    KU8            *pbMsgBuf = NULL;
+    int             i;
+    HANDLE          hPipe = INVALID_HANDLE_VALUE;
+    const char     *pszTmp;
+    KFSLOOKUPERROR  enmIgnored;
 
     /*
-     * Create the cache.
+     * Create the cache and mark the temporary directory as using the custom revision.
      */
     g_pFsCache = kFsCacheCreate(KFSCACHE_F_MISSING_OBJECTS | KFSCACHE_F_MISSING_PATHS);
     if (!g_pFsCache)
         return kwErrPrintfRc(3, "kFsCacheCreate failed!\n");
+
+    pszTmp = getenv("TEMP");
+    if (pszTmp && *pszTmp != '\0')
+        kFsCacheSetupCustomRevisionForTree(g_pFsCache, kFsCacheLookupA(g_pFsCache, pszTmp, &enmIgnored));
+    pszTmp = getenv("TMP");
+    if (pszTmp && *pszTmp != '\0')
+        kFsCacheSetupCustomRevisionForTree(g_pFsCache, kFsCacheLookupA(g_pFsCache, pszTmp, &enmIgnored));
+    pszTmp = getenv("TMPDIR");
+    if (pszTmp && *pszTmp != '\0')
+        kFsCacheSetupCustomRevisionForTree(g_pFsCache, kFsCacheLookupA(g_pFsCache, pszTmp, &enmIgnored));
 
     /*
@@ -5271 +5284 @@
                 return kwErrPrintfRc(2, "--pipe takes an argument!\n");
         }
+        else if (strcmp(argv[i], "--volatile") == 0)
+        {
+            i++;
+            if (i < argc)
+                kFsCacheSetupCustomRevisionForTree(g_pFsCache, kFsCacheLookupA(g_pFsCache, argv[i], &enmIgnored));
+            else
+                return kwErrPrintfRc(2, "--volatile takes an argument!\n");
+        }
         else if (strcmp(argv[i], "--test") == 0)
             return kwTestRun(argc - i - 1, &argv[i + 1]);
@@ -5277 +5298 @@
                  || strcmp(argv[i], "-?") == 0)
         {
-            printf("usage: kWorker --pipe <pipe-handle>\n"
+            printf("usage: kWorker [--volatile dir] --pipe <pipe-handle>\n"
                    "usage: kWorker <--help|-h>\n"
                    "usage: kWorker <--version|-V>\n"
-                   "usage: kWorker --test [<times> [--chdir <dir>]] -- args\n"
+                   "usage: kWorker [--volatile dir] --test [<times> [--chdir <dir>]] -- args\n"
                    "\n"
                    "This is an internal kmk program that is used via the builtin_kSubmit.\n");