Changeset 23364 in vbox

Timestamp:

Sep 28, 2009 11:19:49 AM (16 years ago)

Author:

vboxsync

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

52888

Message:

Runtime/Aio-posix: The error code from lio_listio is in errno

File:

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

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

@@ -45 +45 @@
 #include "internal/fileaio.h"
 
-#if defined(RT_OS_DARWIN)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
 # include <sys/types.h>
 # include <sys/sysctl.h> /* for sysctlbyname */
+#endif
+#if defined(RT_OS_FREEBSD)
+# include <fcntl.h> /* O_SYNC */
 #endif
 #include <aio.h>
@@ -238 +241 @@
     pAioLimits->cReqsOutstandingMax = cReqsOutstandingMax;
     pAioLimits->cbBufferAlignment   = 0;
+#elif defined(RT_OS_FREEBSD)
+    /*
+     * The AIO API is implemented in a kernel module which is not
+     * loaded by default.
+     * If it is loaded there are additional sysctl parameters.
+     */
+    int cReqsOutstandingMax = 0;
+    size_t cbParameter = sizeof(int);
+
+    rcBSD = sysctlbyname("vfs.aio.max_aio_per_proc", /* name */
+                         &cReqsOutstandingMax,       /* Where to store the old value. */
+                         &cbParameter,               /* Size of the memory pointed to. */
+                         NULL,                       /* Where the new value is located. */
+                         NULL);                      /* Where the size of the new value is stored. */
+    if (rcBSD == -1)
+    {
+        /* ENOENT means the value is unknown thus the module is not loaded. */
+        if (errno == ENOENT)
+            return VERR_NOT_SUPPORTED;
+        else
+            return RTErrConvertFromErrno(errno);
+    }
+
+    pAioLimits->cReqsOutstandingMax = cReqsOutstandingMax;
+    pAioLimits->cbBufferAlignment   = 0;
 #else
     pAioLimits->cReqsOutstandingMax = RTFILEAIO_UNLIMITED_REQS;
@@ -549 +577 @@
             if (RT_UNLIKELY(rcPosix < 0))
             {
-                if (rcPosix == EAGAIN)
+                if (errno == EAGAIN)
                     rc = VERR_FILE_AIO_INSUFFICIENT_RESSOURCES;
                 else
@@ -581 +609 @@
                              * -1 and sets errno to the appropriate value
                              */
-#if defined(RT_OS_DARWIN)
+#if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
                             Assert(rcPosix == -1);
                             pReqInt->Rc = RTErrConvertFromErrno(errno);