Changeset 77927 in vbox for trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

Timestamp:

Mar 27, 2019 11:51:12 PM (6 years ago)

Author:

vboxsync

Message:

FsPerf: Enabled sendfile test on darwin. bugref:9172

File:

• trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp (modified) (7 diffs)

trunk/src/VBox/ValidationKit/utils/fs/FsPerf.cpp

@@ -66 +66 @@
 # include <errno.h>
 # include <unistd.h>
+# include <limits.h>
 # include <sys/types.h>
 # include <sys/fcntl.h>
@@ -78 +79 @@
 #  include <sys/syscall.h>
 # endif
+# ifdef RT_OS_DARWIN
+#  include <sys/uio.h>
+# endif
 #endif
 
@@ -84 +88 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
+/** @def FSPERF_TEST_SENDFILE
+ * Whether to enable the sendfile() tests. */
+#if defined(RT_OS_LINUX) || defined(RT_OS_DARWIN)
+# define FSPERF_TEST_SENDFILE
+#endif
+
 /**
  * Macro for profiling @a a_fnCall (typically forced inline) for about @a a_cNsTarget ns.
@@ -1933 +1943 @@
 }
 
-#if defined(RT_OS_LINUX)
+#ifdef FSPERF_TEST_SENDFILE
 
 /**
@@ -2040 +2050 @@
         off_t cbActual = pArgs->cbSend;
         rc = sendfile((int)RTFileToNative(hFile1), (int)RTSocketToNative(hServer),
+#  ifdef RT_OS_DARWIN
+                      pArgs->offFile, &cbActual, NULL, fSfFlags);
+#  else
                       pArgs->offFile, cbActual, NULL,  &cbActual, fSfFlags);
+#  endif
         int const iErr = errno;
         if (rc != 0)
@@ -2157 +2171 @@
 }
 
-#endif /* RT_OS_LINUX */
+#endif /* FSPERF_TEST_SENDFILE */
 #ifdef RT_OS_LINUX
 
@@ -3900 +3914 @@
             for (unsigned i = 0; i < g_cIoBlocks; i++)
                 fsPerfIoReadBlockSize(hFile1, cbFile, g_acbIoBlocks[i]);
-#if defined(RT_OS_LINUX)
+#ifdef FSPERF_TEST_SENDFILE
         if (g_fSendFile)
             fsPerfSendFile(hFile1, cbFile);