Changeset 3359 for trunk/src/kmk

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.

Location:

trunk/src/kmk

Files:

• dir-nt-bird.c (modified) (1 diff)
• function.c (modified) (1 diff)
• makeint.h (modified) (1 diff)
• w32/winchildren.c (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