Changeset 2855 in kBuild

Timestamp:

Aug 31, 2016 9:21:22 PM (9 years ago)

Author:

bird

Message:

Updates

Location:

trunk/src/lib/nt

Files:

• kFsCache.c (modified) (7 diffs)
• kFsCache.h (modified) (4 diffs)

trunk/src/lib/nt/kFsCache.c

@@ -695 +695 @@
 #endif
                           ;
-    PKFSOBJ pObj = (PKFSOBJ)kHlpAlloc(cbObj);
+    PKFSOBJ pObj;
+    kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
+
+    pObj = (PKFSOBJ)kHlpAlloc(cbObj);
     if (pObj)
     {
@@ -715 +718 @@
         pObj->fFlags        = pParent->Obj.fFlags;
         pObj->pParent       = pParent;
+        pObj->pUserDataHead = NULL;
 
 #ifdef KFSCACHE_CFG_UTF16
@@ -2131 +2135 @@
     KU32        idxHashTab = uHashPath % K_ELEMENTS(pCache->apAnsiPaths);
     PKFSHASHA   pHashEntry = pCache->apAnsiPaths[idxHashTab];
+    kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
     if (pHashEntry)
     {
@@ -2220 +2225 @@
     KU32        idxHashTab = uHashPath % K_ELEMENTS(pCache->apAnsiPaths);
     PKFSHASHW   pHashEntry = pCache->apUtf16Paths[idxHashTab];
+    kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
     if (pHashEntry)
     {
@@ -2293 +2299 @@
     kHlpAssert(pObj->cRefs == 0);
     kHlpAssert(pObj->pParent == NULL);
-
+    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+
+    /*
+     * Invalidate the structure.
+     */
+    pObj->u32Magic = ~KFSOBJ_MAGIC;
+
+    /*
+     * Destroy any user data first.
+     */
+    while (pObj->pUserDataHead != NULL)
+    {
+        PKFSUSERDATA pUserData = pObj->pUserDataHead;
+        pObj->pUserDataHead = pUserData->pNext;
+        pUserData->pfnDestructor(pCache, pObj, pUserData);
+        kHlpFree(pUserData);
+    }
+
+    /*
+     * Do type specific destruction
+     */
     switch (pObj->bObjType)
     {
         case KFSOBJ_TYPE_MISSING:
-        //case KFSOBJ_TYPE_MISSING | KFSOBJ_TYPE_F_INVALID:
             /* nothing else to do here */
+            pCache->cbObjects -= sizeof(KFSDIR);
+            break;
+
+        case KFSOBJ_TYPE_DIR:
+        {
+            PKFSDIR pDir = (PKFSDIR)pObj;
+            KU32    cChildren = pDir->cChildren;
+            pCache->cbObjects -= sizeof(*pDir)
+                               + K_ALIGN_Z(cChildren, 16) * sizeof(pDir->papChildren)
+                               + pDir->cHashTab * sizeof(pDir->paHashTab);
+
+            pDir->cChildren   = 0;
+            while (cChildren-- > 0)
+                kFsCacheObjRelease(pCache, pDir->papChildren[cChildren]);
+            kHlpFree(pDir->papChildren);
+            pDir->papChildren = NULL;
+
+            kHlpFree(pDir->paHashTab);
+            pDir->paHashTab = NULL;
+            break;
+        }
+
+        case KFSOBJ_TYPE_FILE:
+        case KFSOBJ_TYPE_OTHER:
             pCache->cbObjects -= sizeof(*pObj);
             break;
 
-        case KFSOBJ_TYPE_DIR:
-        //case KFSOBJ_TYPE_DIR | KFSOBJ_TYPE_F_INVALID:
-        case KFSOBJ_TYPE_FILE:
-        //case KFSOBJ_TYPE_FILE | KFSOBJ_TYPE_F_INVALID:
-            kHlpAssertFailed();
-            break;
         default:
-            kHlpAssertFailed();
-    }
+            return 0;
+    }
+
+    /*
+     * Common bits.
+     */
+    pCache->cbObjects -= pObj->cchName + 1;
+#ifdef KFSCACHE_CFG_UTF16
+    pCache->cbObjects -= (pObj->cwcName + 1) * sizeof(wchar_t);
+#endif
+#ifdef KFSCACHE_CFG_SHORT_NAMES
+    if (pObj->pszName != pObj->pszShortName)
+    {
+        pCache->cbObjects -= pObj->cchShortName + 1;
+# ifdef KFSCACHE_CFG_UTF16
+        pCache->cbObjects -= (pObj->cwcShortName + 1) * sizeof(wchar_t);
+# endif
+    }
+#endif
     pCache->cObjects--;
-    free(pObj);
+
+    kHlpFree(pObj);
     return 0;
 }
@@ -2326 +2387 @@
 KU32 kFsCacheObjRelease(PKFSCACHE pCache, PKFSOBJ pObj)
 {
-    KU32 cRefs = --pObj->cRefs;
+    KU32 cRefs;
+    kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
+    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+
+    cRefs = --pObj->cRefs;
     if (cRefs)
         return cRefs;
@@ -2341 +2406 @@
 KU32 kFsCacheObjRetain(PKFSOBJ pObj)
 {
-    KU32 cRefs = ++pObj->cRefs;
+    KU32 cRefs;
+    kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
+    kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+
+    cRefs = ++pObj->cRefs;
     kHlpAssert(cRefs < 16384);
     return cRefs;

trunk/src/lib/nt/kFsCache.h

@@ -95 +95 @@
 
 
+/** Pointer to a cache. */
+typedef struct KFSCACHE *PKFSCACHE;
 /** Pointer to a core object.  */
 typedef struct KFSOBJ *PKFSOBJ;
@@ -116 +118 @@
     PKFSOBJ             pObj;
 } KFSOBJHASH;
+
+
+/** Pointer to a user data item. */
+typedef struct KFSUSERDATA *PKFSUSERDATA;
+/**
+ * User data item associated with a cache node.
+ */
+typedef struct KFSUSERDATA
+{
+    /** Pointer to the next piece of user data. */
+    PKFSUSERDATA    pNext;
+    /** The key identifying this user. */
+    KUPTR           uKey;
+    /** The destructor. */
+    void (*pfnDestructor)(PKFSCACHE pCache, PKFSOBJ pObj, PKFSUSERDATA pData);
+} KFSUSERDATA;
 
 
@@ -180 +198 @@
 #endif
 
+    /** Pointer to the first user data item */
+    PKFSUSERDATA        pUserDataHead;
+
     /** Stats - only valid when fHaveStats is set. */
     BirdStat_T          Stats;
@@ -317 +338 @@
 
 
-/** Pointer to a cache.   */
-typedef struct KFSCACHE *PKFSCACHE;
 /**
  * Directory cache instance.