Changeset 29587 in vbox for trunk/src/VBox/VMM

Timestamp:

May 17, 2010 9:42:26 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Fix hang when closing the VM and flush the cache

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletionFile.cpp (modified) (3 diffs)
• PDMAsyncCompletionFileCache.cpp (modified) (2 diffs)
• PDMAsyncCompletionFileInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp

@@ -912 +912 @@
 static int pdmacFileEpClose(PPDMASYNCCOMPLETIONENDPOINT pEndpoint)
 {
+    int rc = VINF_SUCCESS;
     PPDMASYNCCOMPLETIONENDPOINTFILE pEpFile = (PPDMASYNCCOMPLETIONENDPOINTFILE)pEndpoint;
     PPDMASYNCCOMPLETIONEPCLASSFILE pEpClassFile = (PPDMASYNCCOMPLETIONEPCLASSFILE)pEndpoint->pEpClass;
 
+    /* Free the cached data. */
+    if (pEpFile->fCaching)
+    {
+        rc = pdmacFileEpCacheFlush(pEpFile);
+        AssertRC(rc);
+        pdmacFileEpCacheDestroy(pEpFile);
+    }
+
     /* Make sure that all tasks finished for this endpoint. */
-    int rc = pdmacFileAioMgrCloseEndpoint(pEpFile->pAioMgr, pEpFile);
+    rc = pdmacFileAioMgrCloseEndpoint(pEpFile->pAioMgr, pEpFile);
     AssertRC(rc);
 
@@ -940 +949 @@
     }
 
-    /* Free the cached data. */
-    if (pEpFile->fCaching)
-        pdmacFileEpCacheDestroy(pEpFile);
-
     /* Remove from the bandwidth manager */
     pdmacFileBwUnref(pEpFile->pBwMgr);
@@ -1032 +1037 @@
     if (pEpFile->fCaching)
     {
-        int rc = pdmacFileEpCacheFlush(pEpFile, pTaskFile);
+        int rc = pdmacFileEpCacheFlush(pEpFile);
         AssertRC(rc);
     }

trunk/src/VBox/VMM/PDMAsyncCompletionFileCache.cpp

@@ -1144 +1144 @@
     while (ASMAtomicReadU32(&pEntry->fFlags) & (PDMACFILECACHE_ENTRY_IO_IN_PROGRESS | PDMACFILECACHE_ENTRY_IS_DIRTY))
     {
+        /* Leave the locks to let the I/O thread make progress but reference the entry to prevent eviction. */
+        pdmacFileEpCacheEntryRef(pEntry);
         RTSemRWReleaseWrite(pEndpointCache->SemRWEntries);
+        pdmacFileCacheLockLeave(pCache);
+
         RTThreadSleep(250);
+
+        /* Re-enter all locks */
+        pdmacFileCacheLockEnter(pCache);
         RTSemRWRequestWrite(pEndpointCache->SemRWEntries, RT_INDEFINITE_WAIT);
+        pdmacFileEpCacheEntryRelease(pEntry);
     }
 
@@ -2175 +2183 @@
 }
 
-int pdmacFileEpCacheFlush(PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint, PPDMASYNCCOMPLETIONTASKFILE pTask)
+int pdmacFileEpCacheFlush(PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint)
 {
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc((": pEndpoint=%#p{%s} pTask=%#p\n",
-                 pEndpoint, pEndpoint->Core.pszUri, pTask));
+    LogFlowFunc((": pEndpoint=%#p{%s}\n", pEndpoint, pEndpoint->Core.pszUri));
 
     /* Commit dirty entries in the cache. */

trunk/src/VBox/VMM/PDMAsyncCompletionFileInternal.h

@@ -727 +727 @@
                           RTFOFF off, PCRTSGSEG paSegments, size_t cSegments,
                           size_t cbWrite);
-int pdmacFileEpCacheFlush(PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint, PPDMASYNCCOMPLETIONTASKFILE pTask);
+int pdmacFileEpCacheFlush(PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint);
 
 RT_C_DECLS_END