Changeset 2912 for trunk/src/kmk/dir-nt-bird.c

Timestamp:

Sep 14, 2016, 3:36:15 PM (9 years ago)

Author:

bird

Message:

rewrote kmk_redirect to skip the separate process. Added chache invalidation after directory deletion for addressing kmk rebuild and fetching.

File:

• trunk/src/kmk/dir-nt-bird.c (modified) (2 diffs)

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

@@ -121 +121 @@
                 else
                 {
-                    PKFSOBJ pNameObj = kFsCacheLookupRelativeToDirA(g_pFsCache, (PKFSDIR)pDirObj,
-                                                                    pszName, strlen(pszName), &enmError, NULL);
+                    PKFSOBJ pNameObj = kFsCacheLookupRelativeToDirA(g_pFsCache, (PKFSDIR)pDirObj, pszName, strlen(pszName),
+                                                                    0/*fFlags*/, &enmError, NULL);
                     if (pNameObj)
                     {
@@ -586 +586 @@
 }
 
+/**
+ * Invalidates a deleted directory so the cache can close handles to it.
+ *
+ * Used by kmk_builtin_rm and kmk_builtin_rmdir.
+ *
+ * @returns 0 on success, -1 on failure.
+ * @param   pszDir      The directory to invalidate as deleted.
+ */
+int dir_cache_deleted_directory(const char *pszDir)
+{
+    if (kFsCacheInvalidateDeletedDirectoryA(g_pFsCache, pszDir))
+        return 0;
+    return -1;
+}
+
+
+int kmk_builtin_dircache(int argc, char **argv, char **envp)
+{
+    if (argc >= 2)
+    {
+        const char *pszCmd = argv[1];
+        if (strcmp(pszCmd, "invalidate") == 0)
+        {
+            if (argc == 2)
+            {
+                dir_cache_invalid_all();
+                return 0;
+            }
+            fprintf(stderr, "kmk_builtin_dircache: the 'invalidate' command takes no arguments!\n");
+        }
+        else if (strcmp(pszCmd, "invalidate-missing") == 0)
+        {
+            if (argc == 2)
+            {
+                dir_cache_invalid_missing ();
+                return 0;
+            }
+            fprintf(stderr, "kmk_builtin_dircache: the 'invalidate-missing' command takes no arguments!\n");
+        }
+        else if (strcmp(pszCmd, "volatile") == 0)
+        {
+            int i;
+            for (i = 2; i < argc; i++)
+                dir_cache_volatile_dir(argv[i]);
+            return 0;
+        }
+        else if (strcmp(pszCmd, "deleted") == 0)
+        {
+            int i;
+            for (i = 2; i < argc; i++)
+                dir_cache_deleted_directory(argv[i]);
+            return 0;
+        }
+        else
+            fprintf(stderr, "kmk_builtin_dircache: Invalid command '%s'!\n", pszCmd);
+    }
+    else
+        fprintf(stderr, "kmk_builtin_dircache: No command given!\n");
+
+    K_NOREF(envp);
+    return 2;
+}
+