Changeset 29833 in vbox for trunk/src/VBox

Timestamp:

May 26, 2010 9:40:59 PM (15 years ago)

Author:

vboxsync

Message:

fileaio-freebsd.cpp: Fixes

File:

• trunk/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp (modified) (4 diffs)

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

@@ -407 +407 @@
             if (RT_UNLIKELY(rcBSD < 0))
             {
-                if (rcBSD == EAGAIN)
+                if (errno == EAGAIN)
                     rc = VERR_FILE_AIO_INSUFFICIENT_RESSOURCES;
                 else
@@ -417 +417 @@
                     pReqInt = pahReqs[i];
                     rcBSD = aio_error(&pReqInt->AioCB);
-                    if (rcBSD == EINVAL)
+                    if (rcBSD == EINVAL || rcBSD == EAGAIN)
                     {
                         /* Was not submitted. */
@@ -441 +441 @@
 
         /* Check if we have a flush request now. */
-        if (cReqs)
+        if (cReqs && RT_SUCCESS_NP(rc))
         {
             pReqInt = pahReqs[0];
@@ -455 +455 @@
                  if (RT_UNLIKELY(rcBSD < 0))
                  {
-                    RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
-                    pReqInt->Rc = RTErrConvertFromErrno(errno);
-                    pReqInt->cbTransfered = 0;
-                    return pReqInt->Rc;
+                    if (rcBSD == EAGAIN)
+                    {
+                        /* Was not submitted. */
+                        RTFILEAIOREQ_SET_STATE(pReqInt, PREPARED);
+                        pReqInt->pCtxInt = NULL;
+                        return VERR_FILE_AIO_INSUFFICIENT_RESSOURCES;
+                    }
+                    else
+                    {
+                        RTFILEAIOREQ_SET_STATE(pReqInt, COMPLETED);
+                        pReqInt->Rc = RTErrConvertFromErrno(errno);
+                        pReqInt->cbTransfered = 0;
+                        return pReqInt->Rc;
+                    }
                  }