Changeset 2857 in kBuild

Timestamp:

Sep 1, 2016 3:39:51 AM (9 years ago)

Author:

bird

Message:

updates

Location:

trunk/src

Files:

• kmk/dir-nt-bird.c (modified) (3 diffs)
• kmk/read.c (modified) (1 diff)
• kmk/remake.c (modified) (1 diff)
• lib/nt/kFsCache.c (modified) (3 diffs)
• lib/nt/kFsCache.h (modified) (1 diff)

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

@@ -212 +212 @@
         if (pDirObj->bObjType == KFSOBJ_TYPE_DIR)
         {
-            KMKNTOPENDIR *pDir = xmalloc(sizeof(*pDir));
-            pDir->pDir    = (PKFSDIR)pDirObj;
-            pDir->idxNext = 0;
-            return pDir;
-        }
+            if (kFsCacheDirEnsurePopuplated(g_pFsCache, (PKFSDIR)pDirObj, NULL))
+            {
+                KMKNTOPENDIR *pDir = xmalloc(sizeof(*pDir));
+                pDir->pDir    = (PKFSDIR)pDirObj;
+                pDir->idxNext = 0;
+                return pDir;
+            }
+        }
+        kFsCacheObjRelease(g_pFsCache, pDirObj);
     }
     return NULL;
@@ -330 +334 @@
         }
         kFsCacheObjRelease(g_pFsCache, pPathObj);
-    }
-    errno = ENOENT;
+        errno = ENOENT;
+    }
+    else
+        errno =    enmError == KFSLOOKUPERROR_NOT_DIR
+                || enmError == KFSLOOKUPERROR_PATH_COMP_NOT_DIR
+              ? ENOTDIR : ENOENT;
+
     return -1;
 }
@@ -438 +447 @@
 }
 
+
+/**
+ * Special stat call used by remake.c
+ *
+ * @returns 0 on success, -1 + errno on failure.
+ * @param   pszPath             The path to stat.
+ * @param   pStat               Where to return the mtime field only.
+ */
+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;
+            }
+
+            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);
+}
+

trunk/src/kmk/read.c

@@ -532 +532 @@
     void *stream_buf = NULL;
     struct stat st;
+# ifdef KBUILD_OS_WINDOWS
+    if (!birdStatOnFdJustSize(fileno(ebuf.fp), &st.st_size))
+# else
     if (!fstat (fileno (ebuf.fp), &st))
+# endif
       {
         int stream_buf_size = 256*1024;

trunk/src/kmk/remake.c

@@ -1794 +1794 @@
   int e;
 
+#if defined(KMK) && defined(KBUILD_OS_WINDOWS)
+  extern int stat_only_mtime(const char *pszPath, struct stat *pStat);
+  e = stat_only_mtime (name, &st);
+#else
   EINTRLOOP (e, stat (name, &st));
+#endif
   if (e == 0)
     mtime = FILE_TIMESTAMP_STAT_MODTIME (name, st);

trunk/src/lib/nt/kFsCache.c

@@ -494 +494 @@
     {
         if (pchDot[1] != '.')
-            pchDot = (const char *)kHlpMemChr(pchDot + 1, '.', &pszPath[cchPath] - pchDot - 1);
+        {
+            pchDot++;
+            pchDot = (const char *)kHlpMemChr(pchDot, '.', &pszPath[cchPath] - pchDot);
+        }
         else
         {
             char ch;
-            if (   (ch = pchDot[2]) == '\0'
+            if (   (ch = pchDot[2]) != '\0'
                 && IS_SLASH(ch))
             {
@@ -529 +532 @@
     {
         if (pwcDot[1] != '.')
-            pwcDot = wmemchr(pwcDot + 1, '.', &pwszPath[cwcPath] - pwcDot - 1);
+        {
+            pwcDot++;
+            pwcDot = wmemchr(pwcDot, '.', &pwszPath[cwcPath] - pwcDot);
+        }
         else
         {
             wchar_t wch;
-            if (   (wch = pwcDot[2]) == '\0'
+            if (   (wch = pwcDot[2]) != '\0'
                 && IS_SLASH(wch))
             {
@@ -1155 +1161 @@
     *penmError = KFSLOOKUPERROR_DIR_READ_ERROR;
     return K_TRUE;
+}
+
+
+/**
+ * Does the initial directory populating or refreshes it if it has been
+ * invalidated.
+ *
+ * This assumes the parent directory is opened.
+ *
+ * @returns K_TRUE on success, K_FALSE on error.
+ * @param   pCache              The cache.
+ * @param   pDir                The directory.
+ * @param   penmError           Where to store K_FALSE explanation.  Optional.
+ */
+KBOOL kFsCacheDirEnsurePopuplated(PKFSCACHE pCache, PKFSDIR pDir, KFSLOOKUPERROR *penmError)
+{
+    KFSLOOKUPERROR enmIgnored;
+    if (   pDir->fPopulated
+        && (   pDir->Obj.uCacheGen == KFSOBJ_CACHE_GEN_IGNORE
+            || pDir->Obj.uCacheGen == pCache->uGeneration) )
+        return K_TRUE;
+    return kFsCachePopuplateOrRefreshDir(pCache, pDir, penmError ? penmError : &enmIgnored);
 }
 

trunk/src/lib/nt/kFsCache.h

@@ -408 +408 @@
 
 
+KBOOL       kFsCacheDirEnsurePopuplated(PKFSCACHE pCache, PKFSDIR pDir, KFSLOOKUPERROR *penmError);
 KBOOL       kFsCacheDirAddChild(PKFSCACHE pCache, PKFSDIR pParent, PKFSOBJ pChild, KFSLOOKUPERROR *penmError);
 PKFSOBJ     kFsCacheCreateObject(PKFSCACHE pCache, PKFSDIR pParent,