Changeset 79983 in vbox for trunk/src/VBox/Runtime/common/ioqueue

Timestamp:

Jul 25, 2019 5:21:24 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132417

Message:

Runtime/RTIoQueue: Updates

Location:

trunk/src/VBox/Runtime/common/ioqueue

Files:

• ioqueue-aiofile-provider.cpp (modified) (4 diffs)
• ioqueue-stdfile-provider.cpp (modified) (3 diffs)
• ioqueuebase.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/ioqueue/ioqueue-aiofile-provider.cpp

@@ -88 +88 @@
 /** @interface_method_impl{RTIOQUEUEPROVVTABLE,pfnQueueInit} */
 static DECLCALLBACK(int) rtIoQueueAioFileProv_QueueInit(RTIOQUEUEPROV hIoQueueProv, uint32_t fFlags,
-                                                        size_t cSqEntries, size_t cCqEntries)
+                                                        uint32_t cSqEntries, uint32_t cCqEntries)
 {
     RT_NOREF(fFlags, cCqEntries);
@@ -96 +96 @@
 
     pThis->cReqsToCommitMax = cSqEntries;
-    pThis->cReqsFreeMax     = (uint32_t)cSqEntries;
+    pThis->cReqsFreeMax     = cSqEntries;
     pThis->cReqsFree        = 0;
 
@@ -105 +105 @@
         if (RT_LIKELY(pThis->pahReqsFree))
         {
-            rc = RTFileAioCtxCreate(&pThis->hAioCtx, (uint32_t)cSqEntries, RTFILEAIOCTX_FLAGS_WAIT_WITHOUT_PENDING_REQUESTS);
+            rc = RTFileAioCtxCreate(&pThis->hAioCtx, cSqEntries, RTFILEAIOCTX_FLAGS_WAIT_WITHOUT_PENDING_REQUESTS);
             if (RT_SUCCESS(rc))
                 return VINF_SUCCESS;
@@ -251 +251 @@
                 RTFILEAIOREQ hReq = ahReqs[i];
 
-                paCEvt[idxCEvt].rcReq = RTFileAioReqGetRC(hReq, NULL);
-                paCEvt[idxCEvt].pvUser = RTFileAioReqGetUser(hReq);
+                paCEvt[idxCEvt].rcReq    = RTFileAioReqGetRC(hReq, &paCEvt[idxCEvt].cbXfered);
+                paCEvt[idxCEvt].pvUser   = RTFileAioReqGetUser(hReq);
                 idxCEvt++;
 

trunk/src/VBox/Runtime/common/ioqueue/ioqueue-stdfile-provider.cpp

@@ -102 +102 @@
 {
     /** Size of the submission queue in entries. */
-    size_t                      cSqEntries;
+    uint32_t                    cSqEntries;
     /** Size of the completion queue in entries. */
-    size_t                      cCqEntries;
+    uint32_t                    cCqEntries;
     /** Pointer to the submission queue base. */
     PRTIOQUEUESSQENTRY          paSqEntryBase;
@@ -257 +257 @@
 /** @interface_method_impl{RTIOQUEUEPROVVTABLE,pfnQueueInit} */
 static DECLCALLBACK(int) rtIoQueueStdFileProv_QueueInit(RTIOQUEUEPROV hIoQueueProv, uint32_t fFlags,
-                                                        size_t cSqEntries, size_t cCqEntries)
+                                                        uint32_t cSqEntries, uint32_t cCqEntries)
 {
     RT_NOREF(fFlags);
@@ -264 +264 @@
     int rc = VINF_SUCCESS;
 
-    pThis->cSqEntries    = cSqEntries;
-    pThis->cCqEntries    = cCqEntries;
-    pThis->idxSqProd = 0;
-    pThis->idxSqCons = 0;
-    pThis->idxCqProd = 0;
-    pThis->idxCqCons = 0;
-    pThis->fShutdown     = false;
-    pThis->fState        = 0;
+    pThis->cSqEntries = cSqEntries;
+    pThis->cCqEntries = cCqEntries;
+    pThis->idxSqProd  = 0;
+    pThis->idxSqCons  = 0;
+    pThis->idxCqProd  = 0;
+    pThis->idxCqCons  = 0;
+    pThis->fShutdown  = false;
+    pThis->fState     = 0;
 
     pThis->paSqEntryBase = (PRTIOQUEUESSQENTRY)RTMemAllocZ(cSqEntries * sizeof(RTIOQUEUESSQENTRY));

trunk/src/VBox/Runtime/common/ioqueue/ioqueuebase.cpp

@@ -128 +128 @@
 
 RTDECL(int) RTIoQueueCreate(PRTIOQUEUE phIoQueue, PCRTIOQUEUEPROVVTABLE pProvVTable,
-                            uint32_t fFlags, size_t cSqEntries, size_t cCqEntries)
+                            uint32_t fFlags, uint32_t cSqEntries, uint32_t cCqEntries)
 {
     AssertPtrReturn(phIoQueue, VERR_INVALID_POINTER);
@@ -142 +142 @@
         pThis->pVTbl          = pProvVTable;
         pThis->hIoQueueProv   = (RTIOQUEUEPROV)&pThis->abInst[0];
-        pThis->cSqEntries     = (uint32_t)cSqEntries;
-        pThis->cCqEntries     = (uint32_t)cCqEntries;
+        pThis->cSqEntries     = cSqEntries;
+        pThis->cCqEntries     = cCqEntries;
         pThis->cReqsCommitted = 0;
         pThis->cReqsPrepared  = 0;