Changeset 24530 in vbox

Timestamp:

Nov 9, 2009 11:16:52 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Fix assertion when closing endpoints

File:

• trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp

@@ -681 +681 @@
             AssertMsg(VALID_PTR(pEndpointClose), ("Close endpoint event without a endpoint to close\n"));
 
-            LogFlowFunc((": Closing endpoint %#p{%s}\n", pEndpointClose, pEndpointClose->Core.pszUri));
-
-            /* Make sure all tasks finished. Process the queues a last time first. */
-            rc = pdmacFileAioMgrNormalQueueReqs(pAioMgr, pEndpointClose);
-            AssertRC(rc);
-
-            pEndpointClose->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_CLOSING;
-            fNotifyWaiter = !pdmacFileAioMgrNormalRemoveEndpoint(pEndpointClose);
+            if (pEndpointClose->enmState == PDMASYNCCOMPLETIONENDPOINTFILESTATE_ACTIVE)
+            {
+                LogFlowFunc((": Closing endpoint %#p{%s}\n", pEndpointClose, pEndpointClose->Core.pszUri));
+
+                /* Make sure all tasks finished. Process the queues a last time first. */
+                rc = pdmacFileAioMgrNormalQueueReqs(pAioMgr, pEndpointClose);
+                AssertRC(rc);
+
+                pEndpointClose->enmState = PDMASYNCCOMPLETIONENDPOINTFILESTATE_CLOSING;
+                fNotifyWaiter = !pdmacFileAioMgrNormalRemoveEndpoint(pEndpointClose);
+            }
+            else if (   (pEndpointClose->enmState == PDMASYNCCOMPLETIONENDPOINTFILESTATE_CLOSING)
+                     && (!pEndpointClose->AioMgr.cRequestsActive))
+                fNotifyWaiter = true;
             break;
         }
@@ -770 +776 @@
                 LogFlow(("Signalling waiter\n"));
                 rc = RTSemEventSignal(pAioMgr->EventSemBlock);
-                AssertRC(rc);    
+                AssertRC(rc);
             }
         }