Changeset 3359 for trunk/src/lib/nt/kFsCache.c

Timestamp:

Jun 5, 2020, 6:17:17 PM (5 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.

File:

• trunk/src/lib/nt/kFsCache.c (modified) (2 diffs)

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);
 }