Changeset 32426 in vbox

Timestamp:

Sep 11, 2010 2:40:48 PM (14 years ago)

Author:

vboxsync

Message:

IPRT/fileaio-win: Fix misunderstanding of GetQueuedCompletionStatus. It already returns the completion of the request if a I/O packet is dequeued (non NULL lpOverlapped).

GetOverlappedResult is not required. Fixes returning error codes of the request when returning from RTFileAioCtxWait instead of saving them
in the completed request.

File:

• trunk/src/VBox/Runtime/r3/win/fileaio-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/win/fileaio-win.cpp

@@ -429 +429 @@
                                                dwTimeout);
         ASMAtomicXchgBool(&pCtxInt->fWaiting, false);
-        if (!fSucceeded)
+        if (   !fSucceeded
+            && !pOverlapped)
         {
-            /* Includes VERR_TIMEOUT */
+            /* The call failed to dequeue a completion packet, includes VERR_TIMEOUT */
             rc = RTErrConvertFromWin32(GetLastError());
             break;
@@ -438 +439 @@
         /* Check if we got woken up. */
         if (lCompletionKey == AIO_CONTEXT_WAKEUP_EVENT)
+        {
+            Assert(fSucceeded && !pOverlapped)
             break;
+        }
 
         /* A request completed. */
@@ -448 +452 @@
         RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
 
-        /* completion status. */
-        fSucceeded = GetOverlappedResult(pReqInt->hFile,
-                                         &pReqInt->Overlapped,
-                                         &cbTransfered,
-                                         FALSE);
         pReqInt->cbTransfered = cbTransfered;
-        pReqInt->Rc = VINF_SUCCESS;
+        if (fSucceeded)
+            pReqInt->Rc = VINF_SUCCESS;
+        else
+            pReqInt->Rc = RTErrConvertFromWin32(GetLastError());
 
         pahReqs[cRequestsCompleted++] = (RTFILEAIOREQ)pReqInt;