Changeset 2861 for trunk/src/kmk

Timestamp:

Sep 2, 2016, 12:42:55 AM (9 years ago)

Author:

bird

Message:

Updates

Location:

trunk/src/kmk

Files:

• dir-nt-bird.c (modified) (3 diffs)
• incdep.c (modified) (9 diffs)
• job.c (modified) (1 diff)
• kbuild.c (modified) (1 diff)

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

@@ -235 +235 @@
 {
     KMKNTOPENDIR *pDir = (KMKNTOPENDIR *)pvDir;
-    while (pDir->idxNext < pDir->pDir->cChildren)
+    KU32 const    cChildren = pDir->pDir->cChildren;
+    while (pDir->idxNext < cChildren)
     {
         PKFSOBJ pEntry = pDir->pDir->papChildren[pDir->idxNext++];
@@ -267 +268 @@
         }
     }
+
+    /*
+     * Fake the '.' and '..' directories because they're not part of papChildren above.
+     */
+    if (pDir->idxNext < cChildren + 2)
+    {
+        pDir->idxNext++;
+        pDir->DirEnt.d_type    = DT_DIR;
+        pDir->DirEnt.d_namlen  = pDir->idxNext - cChildren;
+        pDir->DirEnt.d_reclen  = offsetof(struct dirent, d_name) + pDir->DirEnt.d_namlen;
+        pDir->DirEnt.d_name[0] = '.';
+        pDir->DirEnt.d_name[1] = '.';
+        pDir->DirEnt.d_name[pDir->DirEnt.d_namlen] = '\0';
+        return &pDir->DirEnt;
+    }
+
     return NULL;
 }
@@ -457 +474 @@
 int stat_only_mtime(const char *pszPath, struct stat *pStat)
 {
-    if (commands_started == 0)
-    {
-        KFSLOOKUPERROR  enmError;
-        PKFSOBJ         pPathObj = kFsCacheLookupA(g_pFsCache, pszPath, &enmError);
-        if (pPathObj)
-        {
-            if (pPathObj->bObjType != KFSOBJ_TYPE_MISSING)
-            {
-                kHlpAssert(pPathObj->fHaveStats); /* currently always true. */
-                pStat->st_mtime = pPathObj->Stats.st_mtime;
-                kFsCacheObjRelease(g_pFsCache, pPathObj);
-                return 0;
-            }
-
+    KFSLOOKUPERROR  enmError;
+    PKFSOBJ         pPathObj = kFsCacheLookupA(g_pFsCache, pszPath, &enmError);
+    if (pPathObj)
+    {
+        if (pPathObj->bObjType != KFSOBJ_TYPE_MISSING)
+        {
+            kHlpAssert(pPathObj->fHaveStats); /* currently always true. */
+            pStat->st_mtime = pPathObj->Stats.st_mtime;
             kFsCacheObjRelease(g_pFsCache, pPathObj);
-            errno = ENOENT;
-        }
-        else
-            errno =    enmError == KFSLOOKUPERROR_NOT_DIR
-                    || enmError == KFSLOOKUPERROR_PATH_COMP_NOT_DIR
-                  ? ENOTDIR : ENOENT;
-        return -1;
-    }
-    /** @todo implement cache refreshing.   */
-    return birdStatFollowLink(pszPath, pStat);
-}
-
+            return 0;
+        }
+
+        kFsCacheObjRelease(g_pFsCache, pPathObj);
+        errno = ENOENT;
+    }
+    else
+        errno =    enmError == KFSLOOKUPERROR_NOT_DIR
+                || enmError == KFSLOOKUPERROR_PATH_COMP_NOT_DIR
+              ? ENOTDIR : ENOENT;
+    return -1;
+}
+
+
+/**
+ * Invalidate missing bits of the directory cache.
+ *
+ * This is called each time a make job completes.
+ */
+void dir_cache_invalid_missing(void)
+{
+    kFsCacheInvalidateMissing(g_pFsCache);
+}
+

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

trunk/src/kmk/job.c

@@ -686 +686 @@
               if (job_counter)
                 --job_counter;
+
+# if defined(KMK) && defined(KBUILD_OS_WINDOWS)
+              /* Invalidate negative directory cache entries now that a
+                 job has completed and possibly created new files that
+                 was missing earlier. */
+              extern void dir_cache_invalid_missing(void);
+              dir_cache_invalid_missing ();
+# endif
             }
           else

trunk/src/kmk/kbuild.c

@@ -29 +29 @@
 *   Header Files                                                               *
 *******************************************************************************/
+#define NO_MEMCOPY_HACK
 #include "make.h"
 #include "filedef.h"