Changeset 2944 in kBuild

Timestamp:

Sep 20, 2016 1:46:09 AM (8 years ago)

Author:

bird

Message:

kFsCache: Finally tracked down the heap corruption bug in the directory refreshing code. Added kFsCacheObjReleaseTagged for debugging.

File:

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

trunk/src/lib/nt/kFsCache.c

@@ -1114 +1114 @@
     if (cOldChildren > 0)
     {
-        KU32 const  iNextOldChild = K_MIN(pDirRePop->iNextOldChild, cOldChildren);
+        KU32 const  iNextOldChild = K_MIN(pDirRePop->iNextOldChild, cOldChildren - 1);
         PKFSOBJ     pCur          = pDirRePop->papOldChildren[iNextOldChild];
 
@@ -3647 +3647 @@
  * @param   pCache              The cache.
  * @param   pObj                The object.
- */
-KU32 kFsCacheObjDestroy(PKFSCACHE pCache, PKFSOBJ pObj)
+ * @param   pszWhere            Where it was released from.
+ */
+KU32 kFsCacheObjDestroy(PKFSCACHE pCache, PKFSOBJ pObj, const char *pszWhere)
 {
     kHlpAssert(pObj->cRefs == 0);
@@ -3654 +3655 @@
     kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
 
-    KFSCACHE_LOG(("Destroying %s/%s, type=%d\n", pObj->pParent ? pObj->pParent->Obj.pszName : "", pObj->pszName, pObj->bObjType));
+    KFSCACHE_LOG(("Destroying %s/%s, type=%d, pObj=%p, pszWhere=%s\n",
+                  pObj->pParent ? pObj->pParent->Obj.pszName : "", pObj->pszName, pObj->bObjType, pObj, pszWhere));
     if (pObj->abUnused[1] != 0)
     {
@@ -3747 +3749 @@
  * @param   pObj                The object.
  */
+#undef kFsCacheObjRelease
 KU32 kFsCacheObjRelease(PKFSCACHE pCache, PKFSOBJ pObj)
 {
@@ -3758 +3761 @@
         if (cRefs)
             return cRefs;
-        return kFsCacheObjDestroy(pCache, pObj);
+        return kFsCacheObjDestroy(pCache, pObj, "kFsCacheObjRelease");
+    }
+    return 0;
+}
+
+
+/**
+ * Debug version of kFsCacheObjRelease
+ *
+ * @returns New reference count.
+ * @param   pCache              The cache.
+ * @param   pObj                The object.
+ * @param   pszWhere            Where it's invoked from.
+ */
+KU32 kFsCacheObjReleaseTagged(PKFSCACHE pCache, PKFSOBJ pObj, const char *pszWhere)
+{
+    if (pObj)
+    {
+        KU32 cRefs;
+        kHlpAssert(pCache->u32Magic == KFSCACHE_MAGIC);
+        kHlpAssert(pObj->u32Magic == KFSOBJ_MAGIC);
+
+        cRefs = --pObj->cRefs;
+        if (cRefs)
+            return cRefs;
+        return kFsCacheObjDestroy(pCache, pObj, pszWhere);
     }
     return 0;