Changeset 66736 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

May 2, 2017 12:01:39 AM (8 years ago)

Author:

vboxsync

Message:

iso9660vfs,fatvfs: reference count fix

Location:

trunk/src/VBox/Runtime/common

Files:

• fs/fatvfs.cpp (modified) (3 diffs)
• fs/iso9660vfs.cpp (modified) (9 diffs)
• vfs/vfsbase.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/fs/fatvfs.cpp

@@ -3569 +3569 @@
 
         /* Root also retains the whole file system. */
-        if (!pDir->Core.pParentDir)
+        if (pDir->Core.pVol->pRootDir == pDir)
         {
             Assert(pDir->Core.pVol);
@@ -3602 +3602 @@
     if (RTListIsEmpty(&pDir->OpenChildren))
     {
+        bool const fIsRootDir = pDir->Core.pVol->pRootDir == pDir;
+
         uint32_t cRefs = RTVfsDirRelease(pDir->hVfsSelf);
         Assert(cRefs != UINT32_MAX); NOREF(cRefs);
@@ -3608 +3610 @@
            holds a reference to the root directory, it will remain valid after
            the above release. */
-        if (!pDir->Core.pParentDir)
+        if (fIsRootDir)
         {
             Assert(cRefs > 0);
             Assert(pDir->Core.pVol);
             Assert(pDir->Core.pVol == pChild->pVol);
-            cRefs = RTVfsRetain(pDir->Core.pVol->hVfsSelf);
+            cRefs = RTVfsRelease(pDir->Core.pVol->hVfsSelf);
             Assert(cRefs != UINT32_MAX); NOREF(cRefs);
         }

trunk/src/VBox/Runtime/common/fs/iso9660vfs.cpp

@@ -291 +291 @@
 {
     PRTFSISO9660FILE pThis = (PRTFSISO9660FILE)pvThis;
+    LogFlow(("rtFsIso9660File_Close(%p)\n", pThis));
     return rtFsIso9660Obj_Close(&pThis->Core);
 }
@@ -777 +778 @@
 {
     PRTFSISO9660DIR pThis = (PRTFSISO9660DIR)pvThis;
+    LogFlow(("rtFsIso9660Dir_Close(%p)\n", pThis));
     if (pThis->pbDir)
     {
@@ -1035 +1037 @@
 
         /* Root also retains the whole file system. */
-        if (!pDir->Core.pParentDir)
+        if (pDir->Core.pVol->pRootDir == pDir)
         {
             Assert(pDir->Core.pVol);
@@ -1041 +1043 @@
             cRefs = RTVfsRetain(pDir->Core.pVol->hVfsSelf);
             Assert(cRefs != UINT32_MAX); NOREF(cRefs);
+            LogFlow(("rtFsIso9660Dir_AddOpenChild(%p,%p) retains volume (%d)\n", pDir, pChild, cRefs));
         }
-    }
+        else
+            LogFlow(("rtFsIso9660Dir_AddOpenChild(%p,%p) retains parent only (%d)\n", pDir, pChild, cRefs));
+    }
+    else
+        LogFlow(("rtFsIso9660Dir_AddOpenChild(%p,%p) retains nothing\n", pDir, pChild));
     RTListAppend(&pDir->OpenChildren, &pChild->Entry);
     pChild->pParentDir = pDir;
@@ -1068 +1075 @@
     if (RTListIsEmpty(&pDir->OpenChildren))
     {
+        bool const fIsRootDir = pDir->Core.pVol->pRootDir == pDir;
+
         uint32_t cRefs = RTVfsDirRelease(pDir->hVfsSelf);
         Assert(cRefs != UINT32_MAX); NOREF(cRefs);
@@ -1074 +1083 @@
            holds a reference to the root directory, it will remain valid after
            the above release. */
-        if (!pDir->Core.pParentDir)
+        if (fIsRootDir)
         {
             Assert(cRefs > 0);
             Assert(pDir->Core.pVol);
             Assert(pDir->Core.pVol == pChild->pVol);
-            cRefs = RTVfsRetain(pDir->Core.pVol->hVfsSelf);
+            cRefs = RTVfsRelease(pDir->Core.pVol->hVfsSelf);
             Assert(cRefs != UINT32_MAX); NOREF(cRefs);
+            LogFlow(("rtFsIso9660Dir_RemoveOpenChild(%p,%p) releases volume (%d)\n", pDir, pChild, cRefs));
         }
-    }
+        else
+            LogFlow(("rtFsIso9660Dir_RemoveOpenChild(%p,%p) releases parent only (%d)\n", pDir, pChild, cRefs));
+    }
+    else
+        LogFlow(("rtFsIso9660Dir_RemoveOpenChild(%p,%p) releases nothing\n", pDir, pChild));
 }
 
@@ -1227 +1241 @@
 {
     PRTFSISO9660VOL pThis = (PRTFSISO9660VOL)pvThis;
+    LogFlow(("rtFsIso9660Vol_Close(%p)\n", pThis));
 
     if (pThis->hVfsRootDir != NIL_RTVFSDIR)
@@ -1264 +1279 @@
     {
         *phVfsDir = pThis->hVfsRootDir;
+        LogFlow(("rtFsIso9660Vol_OpenRoot -> %p\n", *phVfsDir));
         return VINF_SUCCESS;
     }
@@ -1617 +1633 @@
  * @param   hVfsSelf        The FAT VFS handle (no reference consumed).
  * @param   hVfsBacking     The file backing the alleged FAT file system.
- *                          Reference is consumed (via rtFsIso9660Vol_Destroy).
+ *                          Reference is consumed (via rtFsIso9660Vol_Close).
  * @param   fFlags          Flags, MBZ.
  * @param   pErrInfo        Where to return additional error info.  Can be NULL.

trunk/src/VBox/Runtime/common/vfs/vfsbase.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_FS
 #include <iprt/vfs.h>
 #include <iprt/vfslowlevel.h>
@@ -35 +36 @@
 #include <iprt/err.h>
 #include <iprt/file.h>
+#include <iprt/log.h>
 #include <iprt/mem.h>
 #include <iprt/param.h>
@@ -1905 +1907 @@
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSDIR_MAGIC, UINT32_MAX);
-    return rtVfsObjRetain(&pThis->Base);
+    uint32_t cRefs = rtVfsObjRetain(&pThis->Base);
+    LogFlow(("RTVfsDirRetain(%p/%p) -> %#x\n", pThis, pThis->Base.pvThis));
+    return cRefs;
 }
 
@@ -1916 +1920 @@
     AssertPtrReturn(pThis, UINT32_MAX);
     AssertReturn(pThis->uMagic == RTVFSDIR_MAGIC, UINT32_MAX);
-    return rtVfsObjRelease(&pThis->Base);
+#ifdef LOG_ENABLED
+    void *pvThis = pThis->Base.pvThis;
+#endif
+    uint32_t cRefs = rtVfsObjRelease(&pThis->Base);
+    LogFlow(("RTVfsDirRelease(%p/%p) -> %#x\n", pThis, pvThis));
+    return cRefs;
 }