Changeset 3359 in kBuild for trunk/src

Timestamp:

Jun 5, 2020 4:17:17 PM (4 years ago)

Author:

bird

Message:

kmk,kFsCache: Added variant of kFsCacheInvalidateAll that also closes directory handles, we need to do this befor ere-executing kmk after having remake some include file we needed. It messes up fetching otherwise.

Location:

trunk/src

Files:

• kmk/dir-nt-bird.c (modified) (1 diff)
• kmk/function.c (modified) (1 diff)
• kmk/makeint.h (modified) (1 diff)
• kmk/w32/winchildren.c (modified) (1 diff)
• lib/nt/kFsCache.c (modified) (2 diffs)
• lib/nt/kFsCache.h (modified) (1 diff)

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

@@ -660 +660 @@
 
 /**
+ * Invalidate the whole directory cache and closes all open handles.
+ *
+ * Used by $(dircache-ctl invalidate-and-close-dirs)
+ * @param   including_root      Also close the root directory.
+ * @note    Multi-thread safe.
+ */
+void dir_cache_invalid_all_and_close_dirs(int including_root)
+{
+    g_cInvalidates++;
+    kFsCacheInvalidateAllAndCloseDirs(g_pFsCache, !!including_root);
+}
+
+/**
  * Invalidate missing bits of the directory cache.
  *

trunk/src/kmk/function.c

@@ -5762 +5762 @@
         O (error, reading_file, "$(dircache-ctl invalidate) takes no parameters");
       dir_cache_invalid_all ();
+    }
+  else if (strcmp (cmd, "invalidate-and-close-dirs") == 0)
+    {
+      if (argv[1] != NULL)
+        O (error, reading_file, "$(dircache-ctl invalidate) takes no parameters");
+      dir_cache_invalid_all_and_close_dirs (0 /*including_root*/);
     }
   else if (strcmp (cmd, "invalidate-missing") == 0)

trunk/src/kmk/makeint.h

@@ -1176 +1176 @@
 extern void dir_cache_invalid_after_job (void);
 extern void dir_cache_invalid_all (void);
+extern void dir_cache_invalid_all_and_close_dirs (int including_root);
 extern void dir_cache_invalid_missing (void);
 extern int dir_cache_volatile_dir (const char *dir);

trunk/src/kmk/w32/winchildren.c

@@ -3648 +3648 @@
      * going on in the "exec'ed" make by keeping directories open.
      */
-    dir_cache_invalid_all();
+    dir_cache_invalid_all_and_close_dirs(1);
 #endif
 

trunk/src/lib/nt/kFsCache.c

@@ -4455 +4455 @@
 
 
-/**
- * Invalidate all cache entries (regular, custom & missing).
- *
- * @param   pCache      The cache.
- */
-void kFsCacheInvalidateAll(PKFSCACHE pCache)
+/** 
+ * Recursively close directories. 
+ */ 
+static void kFsCacheCloseDirs(PKFSOBJ *papChildren, KU32 cChildren)
+{
+    while (cChildren-- > 0)
+    {
+        PKFSDIR pDir = (PKFSDIR)papChildren[cChildren];
+        if (pDir && pDir->Obj.bObjType == KFSOBJ_TYPE_DIR)
+        {
+            if (pDir->hDir != INVALID_HANDLE_VALUE)
+            {
+                g_pfnNtClose(pDir->hDir);
+                pDir->hDir = INVALID_HANDLE_VALUE;
+            }
+            kFsCacheCloseDirs(pDir->papChildren, pDir->cChildren);
+        }
+    }
+}
+
+
+/**
+ * Worker for kFsCacheInvalidateAll and kFsCacheInvalidateAllAndCloseDirs
+ */
+static void kFsCacheInvalidateAllWorker(PKFSCACHE pCache, KBOOL fCloseDirs, KBOOL fIncludingRoot)
 {
     kHlpAssert(pCache->u32Magic == KFSOBJ_MAGIC);
@@ -4475 +4494 @@
     kHlpAssert(pCache->auGenerations[1] < KU32_MAX);
 
+    if (fCloseDirs)
+    {
+        kFsCacheCloseDirs(pCache->RootDir.papChildren, pCache->RootDir.cChildren);
+        if (fCloseDirs && pCache->RootDir.hDir != INVALID_HANDLE_VALUE)
+        {
+            g_pfnNtClose(pCache->RootDir.hDir);
+            pCache->RootDir.hDir = INVALID_HANDLE_VALUE;
+        }
+    }
+
     KFSCACHE_LOG(("Invalidate all - default: %#x/%#x,  custom: %#x/%#x\n",
                   pCache->auGenerationsMissing[0], pCache->auGenerations[0],
                   pCache->auGenerationsMissing[1], pCache->auGenerations[1]));
     KFSCACHE_UNLOCK(pCache);
+}
+
+
+/**
+ * Invalidate all cache entries (regular, custom & missing).
+ *
+ * @param   pCache      The cache.
+ */
+void kFsCacheInvalidateAll(PKFSCACHE pCache)
+{
+    kHlpAssert(pCache->u32Magic == KFSOBJ_MAGIC);
+    kFsCacheInvalidateAllWorker(pCache, K_FALSE, K_FALSE);
+}
+
+
+/**
+ * Invalidate all cache entries (regular, custom & missing) and close all the
+ * directory handles.
+ *
+ * @param   pCache          The cache.
+ * @param   fIncludingRoot  Close the root directory handle too.
+ */
+void kFsCacheInvalidateAllAndCloseDirs(PKFSCACHE pCache, KBOOL fIncludingRoot)
+{
+    kHlpAssert(pCache->u32Magic == KFSOBJ_MAGIC);
+    kFsCacheInvalidateAllWorker(pCache, K_TRUE, fIncludingRoot);
 }
 

trunk/src/lib/nt/kFsCache.h

@@ -555 +555 @@
 void        kFsCacheInvalidateMissing(PKFSCACHE pCache);
 void        kFsCacheInvalidateAll(PKFSCACHE pCache);
+void        kFsCacheInvalidateAllAndCloseDirs(PKFSCACHE pCache, KBOOL fIncludingRoot);
 void        kFsCacheInvalidateCustomMissing(PKFSCACHE pCache);
 void        kFsCacheInvalidateCustomBoth(PKFSCACHE pCache);