Changeset 77928 in vbox for trunk/src/VBox/ValidationKit/utils/fs

Timestamp:

Mar 28, 2019 12:05:23 AM (6 years ago)

Author:

vboxsync

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

129641

Message:

FsPerf: Do the splice() syscall ourselves (forgot) so we can build this against really ancient glibc versions. bugref:9172

File:

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

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

@@ -290 +290 @@
     kCmdOpt_ReadTests,
     kCmdOpt_NoReadTests,
+#ifdef FSPERF_TEST_SENDFILE
     kCmdOpt_SendFile,
     kCmdOpt_NoSendFile,
+#endif
 #ifdef RT_OS_LINUX
     kCmdOpt_Splice,
@@ -378 +380 @@
     { "--read-perf",        kCmdOpt_ReadPerf,       RTGETOPT_REQ_NOTHING },
     { "--no-read-perf",     kCmdOpt_NoReadPerf,     RTGETOPT_REQ_NOTHING },
+#ifdef FSPERF_TEST_SENDFILE
     { "--sendfile",         kCmdOpt_SendFile,       RTGETOPT_REQ_NOTHING },
     { "--no-sendfile",      kCmdOpt_NoSendFile,     RTGETOPT_REQ_NOTHING },
+#endif
 #ifdef RT_OS_LINUX
     { "--splice",           kCmdOpt_Splice,         RTGETOPT_REQ_NOTHING },
@@ -446 +450 @@
 static bool         g_fReadTests = true;
 static bool         g_fReadPerf  = true;
+#ifdef FSPERF_TEST_SENDFILE
 static bool         g_fSendFile  = true;
+#endif
 #ifdef RT_OS_LINUX
 static bool         g_fSplice    = true;
@@ -2174 +2180 @@
 #ifdef RT_OS_LINUX
 
+#ifndef __NR_splice
+# if defined(RT_ARCH_AMD64)
+#  define __NR_splice 275
+# elif defined(RT_ARCH_X86)
+#  define __NR_splice 313
+# else
+#  error "fix me"
+# endif
+#endif
+
+/** FsPerf is built against ancient glibc, so make the splice syscall ourselves. */
+DECLINLINE(ssize_t) syscall_splice(int fdIn, loff_t *poffIn, int fdOut, loff_t *poffOut, size_t cbChunk, unsigned fFlags)
+{
+    return syscall(__NR_splice, fdIn, poffIn, fdOut, poffOut, cbChunk, fFlags);
+}
+
+
 /**
  * Send file thread arguments.
@@ -2263 +2286 @@
         {
             loff_t offFileIn = offFile;
-            ssize_t cbActual = splice((int)RTFileToNative(hFile1), &offFileIn, (int)RTPipeToNative(hPipeW), NULL,
-                                      cbLeft, 0 /*fFlags*/);
+            ssize_t cbActual = syscall_splice((int)RTFileToNative(hFile1), &offFileIn, (int)RTPipeToNative(hPipeW), NULL,
+                                              cbLeft, 0 /*fFlags*/);
             int const iErr = errno;
             if (RT_UNLIKELY(cbActual < 0))
@@ -2472 +2495 @@
         {
             loff_t offFileOut = offFile;
-            ssize_t cbActual  = splice((int)RTPipeToNative(hPipeR), NULL, (int)RTFileToNative(hFile1), &offFileOut,
-                                       cbLeft, 0 /*fFlags*/);
+            ssize_t cbActual  = syscall_splice((int)RTPipeToNative(hPipeR), NULL, (int)RTFileToNative(hFile1), &offFileOut,
+                                               cbLeft, 0 /*fFlags*/);
             int const iErr = errno;
             if (RT_UNLIKELY(cbActual < 0))
@@ -4394 +4417 @@
                 g_fReadTests = true;
                 g_fReadPerf  = true;
+#ifdef FSPERF_TEST_SENDFILE
                 g_fSendFile  = true;
+#endif
 #ifdef RT_OS_LINUX
                 g_fSplice    = true;
@@ -4424 +4449 @@
                 g_fReadTests = false;
                 g_fReadPerf  = false;
+#ifdef FSPERF_TEST_SENDFILE
                 g_fSendFile  = false;
+#endif
 #ifdef RT_OS_LINUX
                 g_fSplice    = false;
@@ -4455 +4482 @@
             CASE_OPT(ReadTests);
             CASE_OPT(ReadPerf);
+#ifdef FSPERF_TEST_SENDFILE
             CASE_OPT(SendFile);
+#endif
 #ifdef RT_OS_LINUX
             CASE_OPT(Splice);
@@ -4617 +4646 @@
                 if (g_fChSize)
                     fsPerfChSize();
-                if (   g_fReadPerf || g_fReadTests || g_fSendFile || g_fWritePerf || g_fWriteTests
+                if (   g_fReadPerf || g_fReadTests || g_fWritePerf || g_fWriteTests
+#ifdef FSPERF_TEST_SENDFILE
+                    || g_fSendFile
+#endif
 #ifdef RT_OS_LINUX
                     || g_fSplice