Changeset 2879 for trunk/src/lib/nt

Timestamp:

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

Author:

bird

Message:

fixes

File:

• trunk/src/lib/nt/kFsCache.c (modified) (3 diffs)

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();
+    }
 
     /*