Changeset 28224 in vbox for trunk/src/VBox

Timestamp:

Apr 12, 2010 7:45:20 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Fix hang on OS X

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletionFileInternal.h (modified) (1 diff)
• PDMAsyncCompletionFileNormal.cpp (modified) (13 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFileInternal.h

@@ -159 +159 @@
     /** Number of requests active currently. */
     unsigned                               cRequestsActive;
+    /** Number of maximum requests active. */
+    uint32_t                               cRequestsActiveMax;
     /** Pointer to an array of free async I/O request handles. */
     RTFILEAIOREQ                          *pahReqsFree;

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp

@@ -43 +43 @@
                                                 PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint);
 
+static PPDMACTASKFILE pdmacFileAioMgrNormalRangeLockFree(PPDMACEPFILEMGR pAioMgr,
+                                                         PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint,
+                                                         PPDMACFILERANGELOCK pRangeLock);
 
 int pdmacFileAioMgrNormalInit(PPDMACEPFILEMGR pAioMgr)
 {
     int rc = VINF_SUCCESS;
+
+    pAioMgr->cRequestsActiveMax = PDMACEPFILEMGR_REQS_MAX;
 
     rc = RTFileAioCtxCreate(&pAioMgr->hAioCtx, RTFILEAIO_UNLIMITED_REQS);
@@ -57 +62 @@
         pAioMgr->iFreeEntryNext = 0;
         pAioMgr->iFreeReqNext   = 0;
-        pAioMgr->cReqEntries    = PDMACEPFILEMGR_REQS_MAX + 1;
+        pAioMgr->cReqEntries    = pAioMgr->cRequestsActiveMax + 1;
         pAioMgr->pahReqsFree    = (RTFILEAIOREQ *)RTMemAllocZ(pAioMgr->cReqEntries * sizeof(RTFILEAIOREQ));
 
@@ -421 +426 @@
 
                     PPDMACTASKFILE pTask = (PPDMACTASKFILE)RTFileAioReqGetUser(pahReqs[i]);
+                    PPDMACTASKFILE pTasksWaiting;
 
                     /* Put the entry on the free array */
@@ -426 +432 @@
                     pAioMgr->iFreeEntryNext = (pAioMgr->iFreeEntryNext + 1) % pAioMgr->cReqEntries;
 
+                    if (pTask->fBounceBuffer)
+                        RTMemFree(pTask->pvBounceBuffer);
+
+                    pTask->fPrefetch = false;
+
+                    /* Free the lock and process pending tasks if neccessary */
+                    pTasksWaiting = pdmacFileAioMgrNormalRangeLockFree(pAioMgr, pEndpoint, pTask->pRangeLock);
+
                     pdmacFileAioMgrEpAddTask(pEndpoint, pTask);
+                    pdmacFileAioMgrEpAddTaskList(pEndpoint, pTasksWaiting);
+
                     pAioMgr->cRequestsActive--;
                     pEndpoint->AioMgr.cRequestsActive--;
                 }
-            }
+
+                pAioMgr->cRequestsActiveMax = pAioMgr->cRequestsActive;
+            }
+            
             LogFlow(("Removed requests. I/O manager has a total of %d active requests now\n", pAioMgr->cRequestsActive));
             LogFlow(("Endpoint has a total of %d active requests now\n", pEndpoint->AioMgr.cRequestsActive));
@@ -549 +568 @@
 }
 
-static int pdmacFileAioMgrNormalRangeLockFree(PPDMACEPFILEMGR pAioMgr,
-                                              PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint,
-                                              PPDMACFILERANGELOCK pRangeLock)
+static PPDMACTASKFILE pdmacFileAioMgrNormalRangeLockFree(PPDMACEPFILEMGR pAioMgr,
+                                                         PPDMASYNCCOMPLETIONENDPOINTFILE pEndpoint,
+                                                         PPDMACFILERANGELOCK pRangeLock)
 {
     PPDMACTASKFILE pTasksWaitingHead;
@@ -564 +583 @@
     RTMemCacheFree(pAioMgr->hMemCacheRangeLocks, pRangeLock);
 
-    return pdmacFileAioMgrNormalProcessTaskList(pTasksWaitingHead, pAioMgr, pEndpoint);
+    return pTasksWaitingHead;
 }
 
@@ -783 +802 @@
     RTFILEAIOREQ  apReqs[20];
     unsigned      cRequests = 0;
-    unsigned      cMaxRequests = PDMACEPFILEMGR_REQS_MAX - pAioMgr->cRequestsActive;
+    unsigned      cMaxRequests = pAioMgr->cRequestsActiveMax - pAioMgr->cRequestsActive;
     int           rc = VINF_SUCCESS;
 
@@ -792 +811 @@
     while (   pTaskHead
            && !pEndpoint->pFlushReq
-           && (cMaxRequests > 0)
+           && (pAioMgr->cRequestsActive + cRequests < pAioMgr->cRequestsActiveMax)
            && RT_SUCCESS(rc))
     {
@@ -845 +864 @@
                     apReqs[cRequests] = hReq;
                     pEndpoint->AioMgr.cReqsProcessed++;
-                    cMaxRequests--;
                     cRequests++;
                     if (cRequests == RT_ELEMENTS(apReqs))
@@ -874 +892 @@
         pdmacFileAioMgrEpAddTaskList(pEndpoint, pTaskHead);
 
-        if (RT_UNLIKELY(  !cMaxRequests
-                       && !pEndpoint->pFlushReq
-                       && !pAioMgr->fBwLimitReached))
+        if (RT_UNLIKELY(   pAioMgr->cRequestsActiveMax == pAioMgr->cRequestsActive
+                        && !pEndpoint->pFlushReq
+                        && !pAioMgr->fBwLimitReached))
         {
             /*
@@ -1102 +1120 @@
     int rcReq            = RTFileAioReqGetRC(hReq, &cbTransfered);
     PPDMACTASKFILE pTask = (PPDMACTASKFILE)RTFileAioReqGetUser(hReq);
+    PPDMACTASKFILE pTasksWaiting;
 
     pEndpoint = pTask->pEndpoint;
@@ -1118 +1137 @@
 
         /* Free the lock and process pending tasks if neccessary */
-        pdmacFileAioMgrNormalRangeLockFree(pAioMgr, pEndpoint, pTask->pRangeLock);
+        pTasksWaiting = pdmacFileAioMgrNormalRangeLockFree(pAioMgr, pEndpoint, pTask->pRangeLock);
+        rc = pdmacFileAioMgrNormalProcessTaskList(pTasksWaiting, pAioMgr, pEndpoint);
+        AssertRC(rc);
 
         pAioMgr->cRequestsActive--;
@@ -1216 +1237 @@
 
             /* Free the lock and process pending tasks if neccessary */
-            pdmacFileAioMgrNormalRangeLockFree(pAioMgr, pEndpoint, pTask->pRangeLock);
+            pTasksWaiting = pdmacFileAioMgrNormalRangeLockFree(pAioMgr, pEndpoint, pTask->pRangeLock);
+            rc = pdmacFileAioMgrNormalProcessTaskList(pTasksWaiting, pAioMgr, pEndpoint);
+            AssertRC(rc);
 
             /* Call completion callback */