Changeset 2886 in kBuild

Timestamp:

Sep 6, 2016 2:31:46 PM (9 years ago)

Author:

bird

Message:

kmk: Added $(dircache-ctl cmd,...) function for controlling the directory content cache on windows. Some other optimizations.

Location:

trunk/src

Files:

• kDepPre/Makefile.kmk (modified) (1 diff)
• kmk/Makefile.kmk (modified) (5 diffs)
• kmk/dir-nt-bird.c (modified) (3 diffs)
• kmk/function.c (modified) (2 diffs)
• kmk/make.h (modified) (1 diff)
• kmk/w32/subproc/sub_proc.c (modified) (1 diff)
• lib/Makefile.kmk (modified) (1 diff)
• lib/kDep.c (modified) (5 diffs)

trunk/src/kDepPre/Makefile.kmk

@@ -29 +29 @@
 PROGRAMS += kDepPre
 kDepPre_TEMPLATE        = BIN
-kDepPre_LIBS            = $(LIB_KDEP)
+kDepPre_LIBS            = $(LIB_KDEP) $(LIB_KUTIL)
 kDepPre_DEFS.linux      = HAVE_FGETC_UNLOCKED=1
 if1of ($(KBUILD_TARGET), win nt)

trunk/src/kmk/Makefile.kmk

@@ -259 +259 @@
 #
 kmk_DEFS += CONFIG_WITH_KMK_BUILTIN
-kmk_LIBS += $(LIB_KUTIL) $(LIB_KDEP)
+kmk_LIBS += $(LIB_KUTIL) #$(LIB_KDEP)
 kmk_SOURCES += \
         kmkbuiltin.c \
@@ -274 +274 @@
         kmkbuiltin/kDepIDB.c \
         kmkbuiltin/kDepObj.c \
+        ../lib/kDep.c \
         kmkbuiltin/md5sum.c \
         kmkbuiltin/mkdir.c \
@@ -283 +284 @@
         kmkbuiltin/kSubmit.c \
         kmkbuiltin/sleep.c \
-        kmkbuiltin/test.c \
+        kmkbuiltin/test.c
 
 ## @todo kmkbuiltin/redirect.c
@@ -418 +419 @@
 kDepIDB_DEFS = kmk_builtin_kDepIDB=main
 kDepIDB_INCS = .
-kDepIDB_LIBS = $(LIB_KDEP)
+kDepIDB_LIBS = $(LIB_KDEP) $(LIB_KUTIL)
 kDepIDB_SOURCES = \
         kmkbuiltin/kDepIDB.c
@@ -425 +426 @@
 kDepObj_DEFS = kmk_builtin_kDepObj=main
 kDepObj_INCS = .
-kDepObj_LIBS = $(LIB_KDEP)
+kDepObj_LIBS = $(LIB_KDEP) $(LIB_KUTIL)
 kDepObj_SOURCES = \
         kmkbuiltin/kDepObj.c

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

@@ -75 +75 @@
 /** Number of times dir_cache_invalid_missing was called. */
 static KU32 g_cInvalidates = 0;
+/** Set by dir_cache_volatile_dir to indicate that the user has marked the
+ * volatile parts of the file system with custom revisioning and we only need to
+ * flush these.  This is very handy when using a separate output directory
+ * from the sources.  */
+static KBOOL g_fFsCacheIsUsingCustomRevision = K_FALSE;
 
 
@@ -505 +510 @@
 }
 
-
-/**
- * Invalidate missing bits of the directory cache.
- *
- * This is called each time a make job completes.
- */
-void dir_cache_invalid_missing(void)
+/**
+ * Do cache invalidation after a job completes.
+ */
+void dir_cache_invalid_after_job(void)
+{
+    g_cInvalidates++;
+    if (g_fFsCacheIsUsingCustomRevision)
+        kFsCacheInvalidateCustomBoth(g_pFsCache);
+    else
+        kFsCacheInvalidateAll(g_pFsCache);
+}
+
+/**
+ * Invalidate the whole directory cache
+ *
+ * Used by $(dircache-ctl invalidate)
+ */
+void dir_cache_invalid_all(void)
 {
     g_cInvalidates++;
@@ -517 +533 @@
 }
 
+/**
+ * Invalidate missing bits of the directory cache.
+ *
+ * Used by $(dircache-ctl invalidate-missing)
+ */
+void dir_cache_invalid_missing(void)
+{
+    g_cInvalidates++;
+    kFsCacheInvalidateAll(g_pFsCache);
+}
+
+/**
+ * Invalidate the volatile bits of the directory cache.
+ *
+ * Used by $(dircache-ctl invalidate-missing)
+ */
+void dir_cache_invalid_volatile(void)
+{
+    g_cInvalidates++;
+    if (g_fFsCacheIsUsingCustomRevision)
+        kFsCacheInvalidateCustomBoth(g_pFsCache);
+    else
+        kFsCacheInvalidateAll(g_pFsCache);
+}
+
+/**
+ * Used by $(dircache-ctl ) to mark a directory subtree or file as volatile.
+ *
+ * The first call changes the rest of the cache to be considered non-volatile.
+ *
+ * @returns 0 on success, -1 on failure.
+ * @param   pszDir      The directory (or file for what that is worth).
+ */
+int dir_cache_volatile_dir(const char *pszDir)
+{
+    KFSLOOKUPERROR enmError;
+    PKFSOBJ pObj = kFsCacheLookupA(g_pFsCache, pszDir, &enmError);
+    if (pObj)
+    {
+        KBOOL fRc = kFsCacheSetupCustomRevisionForTree(g_pFsCache, pObj);
+        kFsCacheObjRelease(g_pFsCache, pObj);
+        if (fRc)
+        {
+            g_fFsCacheIsUsingCustomRevision = K_TRUE;
+            return 0;
+        }
+        error(reading_file, "failed to mark '%s' as volatile", pszDir);
+    }
+    else
+        error(reading_file, "failed to mark '%s' as volatile (not found)", pszDir);
+    return -1;
+}
+

trunk/src/kmk/function.c

@@ -5457 +5457 @@
 }
 
+
+/* Controls the cache in dir-bird-nt.c. */
+
+char *
+func_dircache_ctl (char *o, char **argv UNUSED, const char *funcname UNUSED)
+{
+# ifdef KBUILD_OS_WINDOWS
+  const char *cmd = argv[0];
+  while (isblank ((unsigned char)*cmd))
+    cmd++;
+  if (strcmp (cmd, "invalidate") == 0)
+    {
+      if (argv[1] != NULL)
+        error (reading_file, "$(dircache-ctl invalidate) takes no parameters");
+      dir_cache_invalid_all ();
+    }
+  else if (strcmp (cmd, "invalidate-missing") == 0)
+    {
+      if (argv[1] != NULL)
+        error (reading_file, "$(dircache-ctl invalidate-missing) takes no parameters");
+      dir_cache_invalid_missing ();
+    }
+  else if (strcmp (cmd, "volatile") == 0)
+    {
+      size_t i;
+      for (i = 1; argv[i] != NULL; i++)
+        {
+          const char *dir = argv[i];
+          while (isblank ((unsigned char)*dir))
+            dir++;
+          if (*dir)
+            dir_cache_volatile_dir (dir);
+        }
+    }
+  else
+    error (reading_file, "Unknown $(dircache-ctl ) command: '%s'", cmd);
+# endif
+  return o;
+}
+
 #endif /* KMK */
 
@@ -5645 +5685 @@
 #endif
 #ifdef KMK
+  { STRING_SIZE_TUPLE("dircache-ctl"),  1,  0,  1,  func_dircache_ctl},
   { STRING_SIZE_TUPLE("breakpoint"),    0,  0,  0,  func_breakpoint},
   { STRING_SIZE_TUPLE("set-umask"),     1,  3,  1,  func_set_umask},

trunk/src/kmk/make.h

@@ -980 +980 @@
 extern char *abspath(const char *name, char *apath);
 extern char *func_breakpoint(char *o, char **argv, const char *funcname);
+# ifdef KBUILD_OS_WINDOWS
+extern void dir_cache_invalid_after_job (void);
+extern void dir_cache_invalid_all (void);
+extern void dir_cache_invalid_missing (void);
+extern int dir_cache_volatile_dir (const char *dir);
+# endif
 #endif
 

trunk/src/kmk/w32/subproc/sub_proc.c

@@ -272 +272 @@
                    job has completed and possibly created new files that
                    was missing earlier. */
-                extern void dir_cache_invalid_missing(void);
-                dir_cache_invalid_missing();
+                dir_cache_invalid_after_job ();
 
                 if (pproc->enmType == kRegular) {

trunk/src/lib/Makefile.kmk

@@ -31 +31 @@
 kDep_DEFS.win += NEED_ISBLANK=1 __WIN32__=1
 kDep_SOURCES = kDep.c
-kDep_SOURCES.win = nt_fullpath.c
 kDep_NOINST = 1
 

trunk/src/lib/kDep.c

@@ -33 +33 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#ifdef KMK /* For when it gets compiled and linked into kmk. */
+# include "make.h"
+#endif
 #include <stdio.h>
 #include <stdlib.h>
@@ -46 +49 @@
 # include <io.h>
 # include <Windows.h>
- extern void nt_fullpath(const char *pszPath, char *pszFull, size_t cchFull); /* nt_fullpath.c */
+# include "nt_fullpath.h"
+# include "nt/ntstat.h"
 #else
 # include <dirent.h>
@@ -195 +199 @@
 #endif
         char       *pszFilename;
+#ifndef KMK
         struct stat s;
+#endif
 
         /*
@@ -220 +226 @@
         {
 #if K_OS == K_OS_WINDOWS
-            nt_fullpath(pszFilename, szFilename, sizeof(szFilename));
+            nt_fullpath_cached(pszFilename, szFilename, sizeof(szFilename));
             fixslash(szFilename);
 #else
@@ -233 +239 @@
          * Check that the file exists before we start depending on it.
          */
-        if (stat(pszFilename, &s))
+#ifdef KMK
+        if (!file_exists_p(pszFilename))
+#elif K_OS == K_OS_WINDOWS
+        if (birdStatModTimeOnly(pszFilename, &s.st_mtim, 1 /*fFollowLink*/) != 0)
+#else
+        if (stat(pszFilename, &s) != 0)
+#endif
         {
             if (   !fQuiet