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

Timestamp:

May 13, 2010 3:35:35 PM (15 years ago)

Author:

vboxsync

Message:

AsyncCompletion: Fix parameters for RTFileAioCtxWait

Location:

trunk/src/VBox/VMM

Files:

• PDMAsyncCompletionFile.cpp (modified) (2 diffs)
• PDMAsyncCompletionFileNormal.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/PDMAsyncCompletionFile.cpp

@@ -632 +632 @@
 
             /* Query default backend type */
-#ifndef RT_OS_LINUX
-            rc = CFGMR3QueryStringAllocDef(pCfgNode, "FileBackend", &pszVal, "Buffered");
-#else /* Linux can't use buffered with async */
             rc = CFGMR3QueryStringAllocDef(pCfgNode, "FileBackend", &pszVal, "NonBuffered");
-#endif
             AssertLogRelRCReturn(rc, rc);
 
@@ -658 +654 @@
         {
             /* No configuration supplied, set defaults */
-            pEpClassFile->enmMgrTypeOverride = PDMACEPFILEMGRTYPE_ASYNC;
-#ifdef RT_OS_LINUX
             pEpClassFile->enmEpBackendDefault = PDMACFILEEPBACKEND_NON_BUFFERED;
-#else
-            pEpClassFile->enmEpBackendDefault = PDMACFILEEPBACKEND_BUFFERED;
-#endif
         }
     }

trunk/src/VBox/VMM/PDMAsyncCompletionFileNormal.cpp

@@ -1029 +1029 @@
                     AssertMsg(hReq != NIL_RTFILEAIOREQ, ("Out of request handles\n"));
 
+                    LogFlow(("Flush request %#p\n", hReq));
+
                     rc = RTFileAioReqPrepareFlush(hReq, pEndpoint->File, pCurr);
                     if (RT_FAILURE(rc))
@@ -1071 +1073 @@
                 AssertRC(rc);
 
+                LogFlow(("Read/Write request %#p\n", hReq));
+
                 if (hReq != NIL_RTFILEAIOREQ)
                 {
@@ -1643 +1647 @@
                         cReqsWait = pAioMgr->cRequestsActive;
 
-                    LogFlow(("Waiting for %d of %d tasks to complete\n", pAioMgr->cRequestsActive, cReqsWait));
+                    LogFlow(("Waiting for %d of %d tasks to complete\n", 1, cReqsWait));
 
                     rc = RTFileAioCtxWait(pAioMgr->hAioCtx,
-                                          cReqsWait,
+                                          1,
                                           RT_INDEFINITE_WAIT, apReqs,
-                                          RT_ELEMENTS(apReqs), &cReqsCompleted);
+                                          cReqsWait, &cReqsCompleted);
                     if (RT_FAILURE(rc) && (rc != VERR_INTERRUPTED))
                         CHECK_RC(pAioMgr, rc);