Changeset 80908 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Sep 19, 2019 7:45:06 PM (5 years ago)

Author:

vboxsync

Message:

FsPerf: Better error reporting on that windows flush problem. bugref:9172

File:

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

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

@@ -250 +250 @@
 #endif
 
+#ifdef RT_OS_WINDOWS
+/** @def CHECK_WINAPI
+ * Checks a windows API call, reporting the last error on failure. */
+# define CHECK_WINAPI_CALL(a_CallAndTestExpr) \
+    if (!(a_CallAndTestExpr)) { \
+        RTTestIFailed("line %u: %s failed - last error %u, last status %#x", \
+                      __LINE__, #a_CallAndTestExpr, GetLastError(), RTNtLastStatusValue()); \
+    } else do {} while (0)
+#endif
 
 /*********************************************************************************************************************************
@@ -5373 +5382 @@
         *(size_t volatile *)&pbCur[offFlush + 8] = cbFlush;
 # ifdef RT_OS_WINDOWS
-    RTTESTI_CHECK(FlushViewOfFile(pbCur, cbFlush));
+    CHECK_WINAPI_CALL(FlushViewOfFile(pbCur, cbFlush) == TRUE);
 # else
     RTTESTI_CHECK(msync(pbCur, cbFlush, MS_SYNC) == 0);
@@ -5421 +5430 @@
                     break;
                 dwErr2 = GetLastError();
-                CloseHandle(hSection);
+                CHECK_WINAPI_CALL(CloseHandle(hSection) == TRUE);
             }
             if (cbMapping <= _2M)
@@ -5479 +5488 @@
                 }
 # ifdef RT_OS_WINDOWS
-                RTTESTI_CHECK(FlushViewOfFile(pbMapping, _2M));
+                CHECK_WINAPI_CALL(FlushViewOfFile(pbMapping, _2M) == TRUE);
 # else
                 RTTESTI_CHECK(msync(pbMapping, _2M, MS_SYNC) == 0);
@@ -5550 +5559 @@
                 fsPerfFillWriteBuf(0, pbMapping, cbMapping, 0xf6);
 #  ifdef RT_OS_WINDOWS
-                RTTESTI_CHECK(FlushViewOfFile(pbMapping, cbMapping));
+                CHECK_WINAPI_CALL(FlushViewOfFile(pbMapping, cbMapping) == TRUE);
 #  else
                 RTTESTI_CHECK(msync(pbMapping, cbMapping, MS_SYNC) == 0);
@@ -5611 +5620 @@
          */
 # ifdef RT_OS_WINDOWS
-        RTTESTI_CHECK(UnmapViewOfFile(pbMapping));
-        RTTESTI_CHECK(CloseHandle(hSection));
+        CHECK_WINAPI_CALL(UnmapViewOfFile(pbMapping) == TRUE);
+        CHECK_WINAPI_CALL(CloseHandle(hSection) == TRUE);
 # else
         RTTESTI_CHECK(munmap(pbMapping, cbMapping) == 0);
@@ -5659 +5668 @@
 #ifdef RT_OS_WINDOWS
             HANDLE hSection = CreateFileMapping((HANDLE)RTFileToNative(hFile2), NULL, PAGE_READWRITE, 0, cbContent, NULL);
-            RTTESTI_CHECK_MSG(hSection  != NULL, ("last error %u\n", GetLastError));
+            CHECK_WINAPI_CALL(hSection != NULL);
             uint8_t *pbMapping = (uint8_t *)MapViewOfFile(hSection, FILE_MAP_WRITE, 0, 0, cbContent);
-            RTTESTI_CHECK_MSG(pbMapping != NULL, ("last error %u\n", GetLastError));
-            RTTESTI_CHECK_MSG(CloseHandle(hSection), ("last error %u\n", GetLastError));
+            CHECK_WINAPI_CALL(pbMapping != NULL);
+            CHECK_WINAPI_CALL(CloseHandle(hSection) == TRUE);
 # else
             uint8_t *pbMapping = (uint8_t *)mmap(NULL, cbContent, PROT_READ | PROT_WRITE, MAP_SHARED,
@@ -5701 +5710 @@
                 /* Sync it all. */
 #  ifdef RT_OS_WINDOWS
-                RTTESTI_CHECK(FlushViewOfFile(pbMapping, cbContent));
+                CHECK_WINAPI_CALL(FlushViewOfFile(pbMapping, cbContent) == TRUE);
 #  else
                 RTTESTI_CHECK(msync(pbMapping, cbContent, MS_SYNC) == 0);
@@ -5708 +5717 @@
                 /* Unmap it. */
 # ifdef RT_OS_WINDOWS
-                RTTESTI_CHECK(UnmapViewOfFile(pbMapping));
+                CHECK_WINAPI_CALL(UnmapViewOfFile(pbMapping) == TRUE);
 # else
                 RTTESTI_CHECK(munmap(pbMapping, cbContent) == 0);