Changeset 23411 in vbox for trunk/src

Timestamp:

Sep 29, 2009 3:05:08 PM (15 years ago)

Author:

vboxsync

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

52970

Message:

Runtime/Aio-posix: stricter checking

File:

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

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

@@ -661 +661 @@
 
                     rcPosix = aio_error(&pReqInt->AioCB);
-                    Assert(rcPosix != 0);
-
-                    if (rcPosix != EINPROGRESS)
+
+                    if ((rcPosix != EINPROGRESS) && (rcPosix != 0))
                     {
                         cReqsSubmit--;
@@ -841 +840 @@
            && RT_SUCCESS_NP(rc))
     {
+#ifdef RT_STRICT
+        if (RT_UNLIKELY(!pCtxInt->iFirstFree))
+        {
+            for (unsigned i = 0; i < pCtxInt->cReqsWaitMax; i++)
+                AssertMsg2("wait[%d] = %#p\n", i, pCtxInt->apReqs[i]);
+
+            AssertMsgFailed(("No request to wait for. pReqsWaitHead=%#p pReqsWaitTail=%#p\n",
+                            pCtxInt->pReqsWaitHead, pCtxInt->pReqsWaitTail));
+        }
+#endif
+
         ASMAtomicXchgBool(&pCtxInt->fWaiting, true);
         int rcPosix = aio_suspend((const struct aiocb * const *)pCtxInt->apReqs,
@@ -914 +924 @@
                             pCtxInt->apReqs[pReq->iWaitingList] = pCtxInt->apReqs[--pCtxInt->iFirstFree];
                             pCtxInt->apReqs[pReq->iWaitingList]->iWaitingList = pReq->iWaitingList;
-                            pCtxInt->apReqs[pCtxInt->iFirstFree] = NULL;
                         }
                         else
                             pCtxInt->iFirstFree--;
+
+                        pCtxInt->apReqs[pCtxInt->iFirstFree] = NULL;
                     }