Changeset 23602 in vbox for trunk/src

Timestamp:

Oct 7, 2009 6:29:34 PM (15 years ago)

Author:

vboxsync

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

53274

Message:

Runtime/Aio: Bugfixes

File:

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

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

@@ -277 +277 @@
 
             ASMAtomicDecS32(&pCtxInt->cRequests);
+            AssertMsg(pCtxInt->cRequests >= 0, ("Canceled request not which is not in this context\n"));
             RTSemEventSignal(pCtxInt->SemEventCancel);
         }
@@ -650 +651 @@
             if (RT_UNLIKELY(rcPosix < 0))
             {
+                size_t cReqsSubmitted = cReqsSubmit;
+
                 if (errno == EAGAIN)
                     rc = VERR_FILE_AIO_INSUFFICIENT_RESSOURCES;
@@ -656 +659 @@
 
                 /* Check which ones were not submitted. */
-                for (i = 0; i < cReqs; i++)
+                for (i = 0; i < cReqsSubmit; i++)
                 {
                     pReqInt = pahReqs[i];
@@ -664 +667 @@
                     if ((rcPosix != EINPROGRESS) && (rcPosix != 0))
                     {
-                        cReqsSubmit--;
+                        cReqsSubmitted--;
 
 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
@@ -703 +706 @@
                         else
                             pHead = pNext;
+
+                        pReqInt->pNext = NULL;
+                        pReqInt->pPrev = NULL;
                     }
                 }
-
+                ASMAtomicAddS32(&pCtxInt->cRequests, cReqsSubmitted);
+                AssertMsg(pCtxInt->cRequests > 0, ("Adding requests resulted in overflow\n"));
                 break;
             }
 
             ASMAtomicAddS32(&pCtxInt->cRequests, cReqsSubmit);
+            AssertMsg(pCtxInt->cRequests > 0, ("Adding requests resulted in overflow\n"));
             cReqs   -= cReqsSubmit;
             pahReqs += cReqsSubmit;
@@ -720 +728 @@
          * above.
          */
-        if (cReqs)
+        if (cReqs && RT_SUCCESS_NP(rc))
         {
             pReqInt = pahReqs[0];
             RTFILEAIOREQ_VALID_RETURN(pReqInt);
-
 
             if (pReqInt->fFlush)
@@ -754 +761 @@
 
                 ASMAtomicIncS32(&pCtxInt->cRequests);
+                AssertMsg(pCtxInt->cRequests > 0, ("Adding requests resulted in overflow\n"));
                 cReqs--;
                 pahReqs++;
             }
         }
-    } while (cReqs);
+    } while (   cReqs
+             && RT_SUCCESS_NP(rc));
 
     if (pHead)
@@ -815 +824 @@
     AssertReturn(cReqs >= cMinReqs, VERR_OUT_OF_RANGE);
 
-    if (RT_UNLIKELY(ASMAtomicReadS32(&pCtxInt->cRequests) == 0))
+    int32_t cRequestsWaiting = ASMAtomicReadS32(&pCtxInt->cRequests);
+
+    if (RT_UNLIKELY(cRequestsWaiting == 0))
         return VERR_FILE_AIO_NO_REQUEST;
+
+    if (RT_UNLIKELY(cMinReqs > cRequestsWaiting))
+        return VERR_INVALID_PARAMETER;
 
     if (cMillisTimeout != RT_INDEFINITE_WAIT)
@@ -945 +959 @@
             ASMAtomicSubS32(&pCtxInt->cRequests, cDone);
 
+            AssertMsg(pCtxInt->cRequests >= 0, ("Finished more requests than currently active\n"));
+
             if (!cMinReqs)
                 break;