Changeset 76919 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Jan 21, 2019 1:25:31 PM (6 years ago)

Author:

vboxsync

Message:

FsPerf: Linux updates. bugref:9172

File:

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

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

@@ -53 +53 @@
 #ifdef RT_OS_WINDOWS
 # include <iprt/nt/nt-and-windows.h>
+#else
+# include <errno.h>
+# include <unistd.h>
+# include <sys/fcntl.h>
+# include <sys/mman.h>
+# include <sys/types.h>
 #endif
 
@@ -1873 +1879 @@
     RTTESTI_CHECK(Ios.Status == STATUS_END_OF_FILE);
     RTTESTI_CHECK(Ios.Information == 0);
+#else
+    ssize_t cbRead = read((int)RTFileToNative(hFile1), pbBuf, 0);
+    RTTESTI_CHECK(cbRead == 0);
 #endif
 
@@ -2053 +2062 @@
     RTTESTI_CHECK(Ios.Status == STATUS_SUCCESS);
     RTTESTI_CHECK(Ios.Information == 0);
-
+#else
+    ssize_t cbWritten = write((int)RTFileToNative(hFile1), pbBuf, 0);
+    RTTESTI_CHECK(cbWritten == 0);
+#endif
     RTTESTI_CHECK_RC(RTFileRead(hFile1, pbBuf, _4K, NULL), VINF_SUCCESS);
     fsPerfCheckReadBuf(__LINE__, cbFile - _4K, pbBuf, _4K, pbBuf[0x8]);
-#endif
 
     /*
@@ -2127 +2138 @@
 {
     RTTestISub("mmap");
-#if defined(RT_OS_WINDOWS)
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_LINUX)
     static const char * const s_apszStates[] = { "readonly", "writecopy", "readwrite" };
     enum { kMMap_ReadOnly = 0, kMMap_WriteCopy, kMMap_ReadWrite, kMMap_End };
@@ -2174 +2185 @@
                                         enmState == kMMap_ReadOnly  ? PROT_READ   : PROT_READ | PROT_WRITE,
                                         enmState == kMMap_WriteCopy ? MAP_PRIVATE : MAP_SHARED,
-                                        (int)RTFileToNative(hFile1), cbMapping);
+                                        (int)RTFileToNative(hFile1), 0);
             if ((void *)pbMapping != MAP_FAILED)
                 break;
@@ -2226 +2237 @@
                         continue;
 
+# if defined(RT_OS_LINUX)
+                    size_t const cFlushes = RT_MIN(cbMapping / cbFlush, 2048);
+# else
                     size_t const cFlushes = cbMapping / cbFlush;
+# endif
                     uint8_t     *pbCur    = pbMapping;
                     ns = RTTimeNanoTS();