Changeset 3379 in kBuild

Timestamp:

Jun 12, 2020 12:54:55 AM (5 years ago)

Author:

bird

Message:

kFsCache: Fixed bug in name updating of missing entires. Fixed copy&paste error in lookup wrt flag handling (harmless). Update uCacheGen on old entries during directory repopulation.

File:

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

trunk/src/lib/nt/kFsCache.c

@@ -912 +912 @@
     pCur->pszName = pch;
     pCur->cchName = cchName;
-    pch = kHlpMemPCopy(pch, pchName, cchShortName);
+    pch = kHlpMemPCopy(pch, pchName, cchName);
     *pch++ = '\0';
 
@@ -1535 +1535 @@
                                 }
                             }
+                            if (pCur->uCacheGen != KFSOBJ_CACHE_GEN_IGNORE)
+                                pCur->uCacheGen = pCache->auGenerations[pCur->fFlags & KFSOBJ_F_USE_CUSTOM_GEN];
                         }
                         else if (pCur->bObjType == KFSOBJ_TYPE_MISSING)
@@ -1541 +1543 @@
                                           pDir->Obj.pParent->Obj.pszName, pDir->Obj.pszName, pCur->pszName, bObjType));
                             pCur->bObjType = bObjType;
+                            if (pCur->uCacheGen != KFSOBJ_CACHE_GEN_IGNORE)
+                                pCur->uCacheGen = pCache->auGenerations[pCur->fFlags & KFSOBJ_F_USE_CUSTOM_GEN];
                         }
                         else
@@ -1837 +1841 @@
                           pMissing->pParent->Obj.pszName, pMissing->pszName, bObjType, BasicInfo.FileAttributes));
             pMissing->bObjType  = bObjType;
-            pMissing->uCacheGen = pCache->auGenerations[pMissing->fFlags & KFSOBJ_F_USE_CUSTOM_GEN];
+            /* (auGenerations[] - 1): make sure it's not considered up to date */
+            pMissing->uCacheGen = pCache->auGenerations[pMissing->fFlags & KFSOBJ_F_USE_CUSTOM_GEN] - 1;
+            /* Trigger parent directory repopulation. */
+            if (pMissing->pParent->fPopulated)
+                pMissing->pParent->fNeedRePopulating = K_TRUE;
 /**
  * @todo refresh missing object names when it appears.
@@ -2802 +2810 @@
                 || pParent->Obj.uCacheGen == pCache->auGenerations[pParent->Obj.fFlags & KFSOBJ_F_USE_CUSTOM_GEN]) )
         { /* likely */ }
-        else if (   (fFlags & (KFSCACHE_LOOKUP_F_NO_INSERT | fFlags & KFSCACHE_LOOKUP_F_NO_REFRESH))
+        else if (   (fFlags & (KFSCACHE_LOOKUP_F_NO_INSERT | KFSCACHE_LOOKUP_F_NO_REFRESH))
                  || kFsCachePopuplateOrRefreshDir(pCache, pParent, penmError))
         { /* likely */ }
@@ -2970 +2978 @@
                 || pParent->Obj.uCacheGen == pCache->auGenerations[pParent->Obj.fFlags & KFSOBJ_F_USE_CUSTOM_GEN]) )
         { /* likely */ }
-        else if (   (fFlags & (KFSCACHE_LOOKUP_F_NO_INSERT | fFlags & KFSCACHE_LOOKUP_F_NO_REFRESH))
+        else if (   (fFlags & (KFSCACHE_LOOKUP_F_NO_INSERT | KFSCACHE_LOOKUP_F_NO_REFRESH))
                  || kFsCachePopuplateOrRefreshDir(pCache, pParent, penmError))
         { /* likely */ }