Changeset 30131 in vbox for trunk/src

Timestamp:

Jun 9, 2010 5:49:04 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Fix hang during migration of an endpoint to a failsafe manager, the new I/O manager needs to be updated earlier or a request might wake up the old I/O manager. Fixed another hang during suspend if the endpoint is on the failsafe manager

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletionFile.cpp (modified) (7 diffs)
• PDMAsyncCompletionFileFailsafe.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp

@@ -182 +182 @@
     int rc;
 
+    LogFlowFunc(("pAioMgr=%#p pEndpoint=%#p{%s}\n", pAioMgr, pEndpoint, pEndpoint->Core.pszUri));
+
+    /* Update the assigned I/O manager. */
+    ASMAtomicWritePtr(&pEndpoint->pAioMgr, pAioMgr);
+
     rc = RTCritSectEnter(&pAioMgr->CritSectBlockingEvent);
     AssertRCReturn(rc, rc);
@@ -187 +192 @@
     ASMAtomicWritePtr(&pAioMgr->BlockingEventData.AddEndpoint.pEndpoint, pEndpoint);
     rc = pdmacFileAioMgrWaitForBlockingEvent(pAioMgr, PDMACEPFILEAIOMGRBLOCKINGEVENT_ADD_ENDPOINT);
+    ASMAtomicWritePtr(&pAioMgr->BlockingEventData.AddEndpoint.pEndpoint, NULL);
 
     RTCritSectLeave(&pAioMgr->CritSectBlockingEvent);
-
-    if (RT_SUCCESS(rc))
-        ASMAtomicWritePtr(&pEndpoint->pAioMgr, pAioMgr);
 
     return rc;
@@ -205 +208 @@
     ASMAtomicWritePtr(&pAioMgr->BlockingEventData.RemoveEndpoint.pEndpoint, pEndpoint);
     rc = pdmacFileAioMgrWaitForBlockingEvent(pAioMgr, PDMACEPFILEAIOMGRBLOCKINGEVENT_REMOVE_ENDPOINT);
+    ASMAtomicWritePtr(&pAioMgr->BlockingEventData.RemoveEndpoint.pEndpoint, NULL);
 
     RTCritSectLeave(&pAioMgr->CritSectBlockingEvent);
@@ -220 +224 @@
     ASMAtomicWritePtr(&pAioMgr->BlockingEventData.CloseEndpoint.pEndpoint, pEndpoint);
     rc = pdmacFileAioMgrWaitForBlockingEvent(pAioMgr, PDMACEPFILEAIOMGRBLOCKINGEVENT_CLOSE_ENDPOINT);
+    ASMAtomicWritePtr(&pAioMgr->BlockingEventData.CloseEndpoint.pEndpoint, NULL);
 
     RTCritSectLeave(&pAioMgr->CritSectBlockingEvent);
@@ -655 +660 @@
             /* No configuration supplied, set defaults */
             pEpClassFile->enmEpBackendDefault = PDMACFILEEPBACKEND_NON_BUFFERED;
+            pEpClassFile->enmMgrTypeOverride  = PDMACEPFILEMGRTYPE_ASYNC;
         }
     }
@@ -921 +927 @@
         rc = pdmacFileEpCacheFlush(pEpFile);
         AssertRC(rc);
-        pdmacFileEpCacheDestroy(pEpFile);
     }
 
@@ -931 +936 @@
     AssertMsg(pEpFile->cbFile == pEpFile->cbEndpoint,
               ("Endpoint and real file size should match now!\n"));
+
+    /* Destroy any per endpoint cache data */
+    if (pEpFile->fCaching)
+        pdmacFileEpCacheDestroy(pEpFile);
 
     /*

trunk/src/VBox/VMM/PDMAsyncCompletionFileFailsafe.cpp

@@ -210 +210 @@
             }
 
+            ASMAtomicWriteBool(&pAioMgr->fBlockingEventPending, false);
+            pAioMgr->enmBlockingEvent = PDMACEPFILEAIOMGRBLOCKINGEVENT_INVALID;
+
             /* Release the waiting thread. */
             rc = RTSemEventSignal(pAioMgr->EventSemBlock);