Changeset 23340 in vbox for trunk

Timestamp:

Sep 25, 2009 3:43:24 PM (15 years ago)

Author:

vboxsync

Message:

AIO/Posix: Fix assertion on Darwin. AIO_LISTIO_MAX is defined with 16 there and if cReqs in RTFileAioCtxSubmit is greater than this it will hit this assertion

File:

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

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

@@ -421 +421 @@
     AssertPtrReturn(phAioCtx, VERR_INVALID_POINTER);
 
+    if (cAioReqsMax == RTFILEAIO_UNLIMITED_REQS)
+        return VERR_OUT_OF_RANGE;
+
     pCtxInt = (PRTFILEAIOCTXINTERNAL)RTMemAllocZ(  sizeof(RTFILEAIOCTXINTERNAL)
                                                  + cAioReqsMax * sizeof(PRTFILEAIOREQINTERNAL));
@@ -591 +594 @@
         }
 
-        /* Check if we have a flush request now. */
+        /*
+         * Check if we have a flush request now.
+         * If not we hit the AIO_LISTIO_MAX limit
+         * and will continue submitting requests
+         * above.
+         */
         if (cReqs)
         {
@@ -597 +605 @@
             RTFILEAIOREQ_VALID_RETURN(pReqInt);
 
-            Assert(pReqInt->fFlush);
-
-            /*
-             * lio_listio does not work with flush requests so
-             * we have to use aio_fsync directly.
-             */
-            rcPosix = aio_fsync(O_SYNC, &pReqInt->AioCB);
-            if (RT_UNLIKELY(rcPosix < 0))
+
+            if (pReqInt->fFlush)
             {
-                rc = RTErrConvertFromErrno(errno);
-                RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
-                pReqInt->Rc = rc;
-                pReqInt->cbTransfered = 0;
-
-                /* Unlink from the list. */
-                PRTFILEAIOREQINTERNAL pNext, pPrev;
-                pNext = pReqInt->pNext;
-                pPrev = pReqInt->pPrev;
-                if (pNext)
-                    pNext->pPrev = pPrev;
-                if (pPrev)
-                    pPrev->pNext = pNext;
-                else
-                    pHead = pNext;
-                break;
+                /*
+                 * lio_listio does not work with flush requests so
+                 * we have to use aio_fsync directly.
+                 */
+                rcPosix = aio_fsync(O_SYNC, &pReqInt->AioCB);
+                if (RT_UNLIKELY(rcPosix < 0))
+                {
+                    rc = RTErrConvertFromErrno(errno);
+                    RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+                    pReqInt->Rc = rc;
+                    pReqInt->cbTransfered = 0;
+
+                    /* Unlink from the list. */
+                    PRTFILEAIOREQINTERNAL pNext, pPrev;
+                    pNext = pReqInt->pNext;
+                    pPrev = pReqInt->pPrev;
+                    if (pNext)
+                        pNext->pPrev = pPrev;
+                    if (pPrev)
+                        pPrev->pNext = pNext;
+                    else
+                        pHead = pNext;
+                    break;
+                }
+
+                ASMAtomicIncS32(&pCtxInt->cRequests);
+                cReqs--;
+                pahReqs++;
             }
-
-            ASMAtomicIncS32(&pCtxInt->cRequests);
-            cReqs--;
-            pahReqs++;
         }
     } while (cReqs);