Changeset 2861 in kBuild for trunk/src/kmk/incdep.c

Timestamp:

Sep 1, 2016 10:42:55 PM (8 years ago)

Author:

bird

Message:

Updates

File:

• trunk/src/kmk/incdep.c (modified) (9 diffs)

trunk/src/kmk/incdep.c

@@ -32 +32 @@
 # define INCL_ERRORS
 #endif
+#ifdef KBUILD_OS_WINDOWS
+# ifdef KMK
+#  define INCDEP_USE_KFSCACHE
+# endif
+#endif
 
 #include "make.h"
@@ -63 +68 @@
 # include <Windows.h>
 # define PARSE_IN_WORKER
+#endif
+
+#ifdef INCDEP_USE_KFSCACHE
+# include "nt/kFsCache.h"
+extern PKFSCACHE g_pFsCache; /* dir-nt-bird.c for now */
 #endif
 
@@ -146 +156 @@
   struct incdep_recorded_file *recorded_file_tail;
 #endif
-
+#ifdef INCDEP_USE_KFSCACHE
+  /** Pointer to the fs cache object for this file (it exists and is a file). */
+  PKFSOBJ pFileObj;
+#else
   char name[1];
+#endif
 };
 
@@ -484 +498 @@
 incdep_read_file (struct incdep *cur, struct floc *f)
 {
+#ifdef INCDEP_USE_KFSCACHE
+  size_t const cbFile = (size_t)cur->pFileObj->Stats.st_size;
+
+  assert(cur->pFileObj->fFlags);
+  cur->file_base = incdep_xmalloc (cur, cbFile + 1);
+  if (cur->file_base)
+    {
+      if (kFsCacheFileSimpleOpenReadClose (g_pFsCache, cur->pFileObj, 0, cur->file_base, cbFile))
+        {
+          cur->file_end = cur->file_base + cbFile;
+          cur->file_base[cbFile] = '\0';
+          return 0;
+        }
+      incdep_xfree (cur, cur->file_base);
+    }
+  error (f, "%s/%s: error reading file", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName);
+
+#else /* !INCDEP_USE_KFSCACHE */
   int fd;
   struct stat st;
@@ -526 +558 @@
 
   close (fd);
+#endif /* !INCDEP_USE_KFSCACHE */
   cur->file_base = cur->file_end = NULL;
   return -1;
@@ -541 +574 @@
 
   incdep_xfree (cur, cur->file_base);
+#ifdef INCDEP_USE_KFSCACHE
+  /** @todo release object ref some day... */
+#endif
   cur->next = NULL;
   free (cur);
@@ -890 +926 @@
 
   if (cur->err_msg)
+#ifdef INCDEP_USE_KFSCACHE
+    error(NILF, "%s/%s(%d): %s", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName, cur->err_line_no, cur->err_msg);
+#else
     error(NILF, "%s(%d): %s", cur->name, cur->err_line_no, cur->err_msg);
+#endif
 
 
@@ -967 +1007 @@
 {
   if (cur->worker_tid == -1)
+#ifdef INCDEP_USE_KFSCACHE
+    error (NILF, "%s/%s(%d): %s", cur->pFileObj->pParent->Obj.pszName, cur->pFileObj->pszName, line_no, msg);
+#else
     error (NILF, "%s(%d): %s", cur->name, line_no, msg);
+#endif
 #ifdef PARSE_IN_WORKER
   else
@@ -1754 +1798 @@
   while ((name = find_next_token (&names_iterator, &name_len)) != 0)
     {
+#ifdef INCDEP_USE_KFSCACHE
+       KFSLOOKUPERROR enmError;
+       PKFSOBJ pFileObj = kFsCacheLookupWithLengthA (g_pFsCache, name, name_len, &enmError);
+       if (!pFileObj)
+         continue;
+       if (pFileObj->bObjType != KFSOBJ_TYPE_FILE)
+         {
+           kFsCacheObjRelease (g_pFsCache, pFileObj);
+           continue;
+         }
+
+       cur = xmalloc (sizeof (*cur));            /* not incdep_xmalloc here */
+       cur->pFileObj = pFileObj;
+#else
        cur = xmalloc (sizeof (*cur) + name_len); /* not incdep_xmalloc here */
-       cur->file_base = cur->file_end = NULL;
        memcpy (cur->name, name, name_len);
        cur->name[name_len] = '\0';
+#endif
+
+       cur->file_base = cur->file_end = NULL;
        cur->worker_tid = -1;
 #ifdef PARSE_IN_WORKER