Changeset 19562 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

May 10, 2009 9:44:16 PM (16 years ago)

Author:

vboxsync

Message:

Runtime/Aio: Change API again

• pcReqs in RTFileAioCtxSubmit is useless because it does not specify which request fails. Removed it again and made it possible to get the state of a request through RTFileAioReqGetRC()
• Introduce request states for the first point and to catch more errors using the API before a system dependent call is made to return the same error codes one every system for the same cause.
• Add RTFileAioGetLimits to get global limits and indication for AIO support.
• General cleanups and fixes

File:

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

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

@@ -90 +90 @@
     /** Overlapped structure. */
     OVERLAPPED            Overlapped;
+    /** Current state the request is in. */
+    RTFILEAIOREQSTATE     enmState;
     /** The file handle. */
     HANDLE                hFile;
@@ -122 +124 @@
 #define OVERLAPPED_2_RTFILEAIOREQINTERNAL(pOverlapped) ( (PRTFILEAIOREQINTERNAL)((uintptr_t)(pOverlapped) - RT_OFFSETOF(RTFILEAIOREQINTERNAL, Overlapped)) )
 
+RTR3DECL(int) RTFileAioGetLimits(PRTFILEAIOLIMITS pAioLimits)
+{
+    int rcBSD = 0;
+    AssertPtrReturn(pAioLimits, VERR_INVALID_POINTER);
+
+    /* No limits known. */
+    pAioLimits->cReqsOutstandingMax = RTFILEAIO_UNLIMITED_REQS;
+    pAioLimits->cbBufferAlignment   = 0;
+
+    return VINF_SUCCESS;
+}
+
 RTR3DECL(int) RTFileAioReqCreate(PRTFILEAIOREQ phReq)
 {
@@ -133 +147 @@
     pReqInt->fCompleted = false;
     pReqInt->u32Magic   = RTFILEAIOREQ_MAGIC;
+    RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
 
     *phReq = (RTFILEAIOREQ)pReqInt;
@@ -139 +154 @@
 }
 
-RTDECL(void) RTFileAioReqDestroy(RTFILEAIOREQ hReq)
+RTDECL(int) RTFileAioReqDestroy(RTFILEAIOREQ hReq)
 {
     /*
@@ -145 +160 @@
      */
     if (hReq == NIL_RTFILEAIOREQ)
-        return;
+        return VINF_SUCCESS;
     PRTFILEAIOREQINTERNAL pReqInt = hReq;
-    RTFILEAIOREQ_VALID_RETURN_VOID(pReqInt);
+    RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
 
     /*
@@ -154 +170 @@
     ASMAtomicUoWriteU32(&pReqInt->u32Magic, ~RTFILEAIOREQ_MAGIC);
     RTMemFree(pReqInt);
+    return VINF_SUCCESS;
 }
 
@@ -169 +186 @@
     PRTFILEAIOREQINTERNAL pReqInt = hReq;
     RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
     Assert(hFile != NIL_RTFILE);
     AssertPtr(pvBuf);
@@ -204 +222 @@
     PRTFILEAIOREQINTERNAL pReqInt = hReq;
     RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
     AssertReturn(hFile != NIL_RTFILE, VERR_INVALID_HANDLE);
 
@@ -226 +245 @@
     PRTFILEAIOREQINTERNAL pReqInt = hReq;
     RTFILEAIOREQ_VALID_RETURN(pReqInt);
+    RTFILEAIOREQ_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_NOT_SUBMITTED);
 
     /**
@@ -234 +254 @@
      * is only available from Vista and up.
      * The solution is to return VERR_FILE_AIO_IN_PROGRESS
-     * if the request didn't completed yet.
+     * if the request didn't completed yet (checked above).
      * Shouldn't be a big issue because a request is normally
      * only canceled if it exceeds a timeout which is quite huge.
      */
-    if (pReqInt->fCompleted)
-        return VERR_FILE_AIO_COMPLETED;
-    else
-        return VERR_FILE_AIO_IN_PROGRESS;
+    return VERR_FILE_AIO_COMPLETED;
 }
 
@@ -249 +266 @@
     PRTFILEAIOREQINTERNAL pReqInt = hReq;
     RTFILEAIOREQ_VALID_RETURN(pReqInt);
-
-    if (pReqInt->fCompleted)
-    {
-        rc = pReqInt->Rc;
-        if (*pcbTransfered)
-            *pcbTransfered = pReqInt->cbTransfered;
-    }
-    else
-        rc = VERR_FILE_AIO_IN_PROGRESS;
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, SUBMITTED, VERR_FILE_AIO_IN_PROGRESS);
+    RTFILEAIOREQ_NOT_STATE_RETURN_RC(pReqInt, PREPARED, VERR_FILE_AIO_NOT_SUBMITTED);
+
+    rc = pReqInt->Rc;
+    if (pcbTransfered && RT_SUCCESS(rc))
+        *pcbTransfered = pReqInt->cbTransfered;
 
     return rc;
@@ -325 +339 @@
 }
 
-RTDECL(int) RTFileAioCtxSubmit(RTFILEAIOCTX hAioCtx, PRTFILEAIOREQ pahReqs, size_t cReqs, size_t *pcReqs)
+RTDECL(int) RTFileAioCtxSubmit(RTFILEAIOCTX hAioCtx, PRTFILEAIOREQ pahReqs, size_t cReqs)
 {
     /*
      * Parameter validation.
      */
-    AssertPtrReturn(pcReqs, VERR_INVALID_POINTER);
-    *pcReqs = 0;
     int rc = VINF_SUCCESS;
     PRTFILEAIOCTXINTERNAL pCtxInt = hAioCtx;
@@ -361 +373 @@
         if (RT_UNLIKELY(!fSucceeded && GetLastError() != ERROR_IO_PENDING))
         {
+            RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
             rc = RTErrConvertFromWin32(GetLastError());
+            pReqInt->Rc = rc;
             break;
         }
+        RTFILEAIOREQ_SET_STATE(pReqInt, SUBMITTED);
     }
 
-    *pcReqs = i;
     ASMAtomicAddS32(&pCtxInt->cRequests, i);
 
@@ -440 +454 @@
 
             /* Mark the request as finished. */
-            pReqInt->fCompleted = true;
+            RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
 
             /* completion status. */