Changeset 2879

Timestamp:

Sep 5, 2016, 10:14:21 PM (9 years ago)

Author:

bird

Message:

fixes

Location:

trunk/src

Files:

• kmk/dir-nt-bird.c (modified) (4 diffs)
• kmk/kmkbuiltin/kSubmit.c (modified) (6 diffs)
• lib/nt/kFsCache.c (modified) (3 diffs)

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

@@ -71 +71 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-PKFSCACHE g_pFsCache = NULL;
+/** The cache.*/
+PKFSCACHE   g_pFsCache = NULL;
+/** Number of times dir_cache_invalid_missing was called. */
+static KU32 g_cInvalidates = 0;
 
 
@@ -445 +448 @@
         else
         {
-            if (pPathObj->cchName + 1 < cbFull)
+            if ((size_t)pPathObj->cchName + 1 < cbFull)
             {
                 memcpy(pszFull, pPathObj->pszName, pPathObj->cchName);
@@ -474 +477 @@
 int stat_only_mtime(const char *pszPath, struct stat *pStat)
 {
-    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;
+    /* Currently a little expensive, so just hit the file system once the
+       jobs starts comming in. */
+    if (g_cInvalidates == 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);
-            return 0;
-        }
-
-        kFsCacheObjRelease(g_pFsCache, pPathObj);
-        errno = ENOENT;
-    }
-    else
-        errno =    enmError == KFSLOOKUPERROR_NOT_DIR
-                || enmError == KFSLOOKUPERROR_PATH_COMP_NOT_DIR
-              ? ENOTDIR : ENOENT;
-    return -1;
+            errno = ENOENT;
+        }
+        else
+            errno =    enmError == KFSLOOKUPERROR_NOT_DIR
+                    || enmError == KFSLOOKUPERROR_PATH_COMP_NOT_DIR
+                  ? ENOTDIR : ENOENT;
+        return -1;
+    }
+    return birdStatModTimeOnly(pszPath, &pStat->st_mtim, 1 /*fFollowLink*/);
 }
 
@@ -504 +513 @@
 void dir_cache_invalid_missing(void)
 {
+    g_cInvalidates++;
     kFsCacheInvalidateAll(g_pFsCache);
 }

trunk/src/kmk/kmkbuiltin/kSubmit.c

@@ -791 +791 @@
  * @param   pWorker             The worker instance.
  * @param   dwErr               The error code.
- */
-static int kSubmitWinReadFailed(PWORKERINSTANCE pWorker, DWORD dwErr)
+ * @param   pszWhere            Where it failed.
+ */
+static int kSubmitWinReadFailed(PWORKERINSTANCE pWorker, DWORD dwErr, const char *pszWhere)
 {
     DWORD dwExitCode;
 
     if (pWorker->cbResultRead == 0)
-        errx(1, "ReadFile failed: %u", dwErr);
+        errx(1, "%s/ReadFile failed: %u", pszWhere, dwErr);
     else
-        errx(1, "ReadFile failed: %u (read %u bytes)", dwErr, pWorker->cbResultRead);
+        errx(1, "%s/ReadFile failed: %u (read %u bytes)", pszWhere, dwErr, pWorker->cbResultRead);
     assert(dwErr != 0);
 
@@ -824 +825 @@
  * @param   pWorker             The worker instance.
  */
-static int kSubmitReadMoreResultWin(PWORKERINSTANCE pWorker)
+static int kSubmitReadMoreResultWin(PWORKERINSTANCE pWorker, const char *pszWhere)
 {
     /*
@@ -847 +848 @@
             if (dwErr == ERROR_IO_PENDING)
                 return -1;
-            return kSubmitWinReadFailed(pWorker, dwErr);
+            return kSubmitWinReadFailed(pWorker, dwErr, pszWhere);
         }
 
@@ -886 +887 @@
      */
 l_again:
-    rc = kSubmitReadMoreResultWin(pWorker);
+    rc = kSubmitReadMoreResultWin(pWorker, "kSubmitMarkActive");
     if (rc == -1)
     {
@@ -952 +953 @@
         while (pWorker->cbResultRead < sizeof(pWorker->Result))
         {
-            int rc = kSubmitReadMoreResultWin(pWorker);
+            int rc = kSubmitReadMoreResultWin(pWorker, "kSubmitSubProcGetResult/more");
             if (rc == -1)
                 return -1;
@@ -962 +963 @@
     {
         DWORD dwErr = GetLastError();
-        kSubmitWinReadFailed(pWorker, dwErr);
+        kSubmitWinReadFailed(pWorker, dwErr, "kSubmitSubProcGetResult/result");
     }
 

trunk/src/lib/nt/kFsCache.c

@@ -414 +414 @@
         pHashEntry->fAbsolute       = fAbsolute;
         pHashEntry->idxMissingGen   = (KU8)idxMissingGen;
-        pHashEntry->pFsObj          = pFsObj;
         pHashEntry->enmError        = enmError;
         pHashEntry->pszPath         = (const char *)kHlpMemCopy(pHashEntry + 1, pszPath, cchPath + 1);
         if (pFsObj)
-            pHashEntry->uCacheGen = pFsObj->bObjType != KFSOBJ_TYPE_MISSING
-                                  ? pCache->auGenerations[       pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN]
-                                  : pCache->auGenerationsMissing[pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN];
-        else if (enmError != KFSLOOKUPERROR_UNSUPPORTED)
-            pHashEntry->uCacheGen = pCache->auGenerationsMissing[idxMissingGen];
+        {
+            pHashEntry->pFsObj      = kFsCacheObjRetainInternal(pFsObj);
+            pHashEntry->uCacheGen   = pFsObj->bObjType != KFSOBJ_TYPE_MISSING
+                                    ? pCache->auGenerations[       pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN]
+                                    : pCache->auGenerationsMissing[pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN];
+            pFsObj->abUnused[0] += 1; // for debugging
+        }
         else
-            pHashEntry->uCacheGen = KFSOBJ_CACHE_GEN_IGNORE;
+        {
+            pHashEntry->pFsObj      = NULL;
+            if (enmError != KFSLOOKUPERROR_UNSUPPORTED)
+                pHashEntry->uCacheGen = pCache->auGenerationsMissing[idxMissingGen];
+            else
+                pHashEntry->uCacheGen = KFSOBJ_CACHE_GEN_IGNORE;
+        }
 
         pHashEntry->pNext = pCache->apAnsiPaths[idxHashTab];
@@ -464 +471 @@
         pHashEntry->fAbsolute       = fAbsolute;
         pHashEntry->idxMissingGen   = (KU8)idxMissingGen;
-        pHashEntry->pFsObj          = pFsObj;
         pHashEntry->enmError        = enmError;
         pHashEntry->pwszPath        = (const wchar_t *)kHlpMemCopy(pHashEntry + 1, pwszPath, (cwcPath + 1) * sizeof(wchar_t));
         if (pFsObj)
-            pHashEntry->uCacheGen = pFsObj->bObjType != KFSOBJ_TYPE_MISSING
-                                  ? pCache->auGenerations[       pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN]
-                                  : pCache->auGenerationsMissing[pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN];
-        else if (enmError != KFSLOOKUPERROR_UNSUPPORTED)
-            pHashEntry->uCacheGen = pCache->auGenerationsMissing[idxMissingGen];
+        {
+            pHashEntry->pFsObj      = kFsCacheObjRetainInternal(pFsObj);
+            pHashEntry->uCacheGen   = pFsObj->bObjType != KFSOBJ_TYPE_MISSING
+                                    ? pCache->auGenerations[       pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN]
+                                    : pCache->auGenerationsMissing[pFsObj->fFlags & KFSOBJ_F_USE_CUSTOM_GEN];
+            pFsObj->abUnused[0] += 1; // for debugging
+        }
         else
-            pHashEntry->uCacheGen = KFSOBJ_CACHE_GEN_IGNORE;
+        {
+            pHashEntry->pFsObj      = NULL;
+            if (enmError != KFSLOOKUPERROR_UNSUPPORTED)
+                pHashEntry->uCacheGen = pCache->auGenerationsMissing[idxMissingGen];
+            else
+                pHashEntry->uCacheGen = KFSOBJ_CACHE_GEN_IGNORE;
+        }
 
         pHashEntry->pNext = pCache->apUtf16Paths[idxHashTab];
@@ -3364 +3378 @@
 
     KFSCACHE_LOG(("Destroying %s/%s, type=%d\n", pObj->pParent ? pObj->pParent->Obj.pszName : "", pObj->pszName, pObj->bObjType));
+    if (pObj->abUnused[1] != 0)
+    {
+        fprintf(stderr, "Destroying %s/%s, type=%d, path hash entries: %d!\n", pObj->pParent ? pObj->pParent->Obj.pszName : "",
+                pObj->pszName, pObj->bObjType, pObj->abUnused[0]);
+        __debugbreak();
+    }
 
     /*