Changeset 77969 in vbox for trunk

Timestamp:

Apr 1, 2019 1:20:22 AM (6 years ago)

Author:

vboxsync

Message:

FsPerf: Skip block sizes that exceeds the file size. bugref:9172

File:

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

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

@@ -2732 +2732 @@
 {
     RTTestISubF("IO - Sequential read %RU32", cbBlock);
-
-    uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBlock);
-    if (pbBuf)
-    {
-        memset(pbBuf, 0xf7, cbBlock);
-        PROFILE_IO_FN("RTFileRead", fsPerfIoReadWorker(hFile1, cbFile, cbBlock, pbBuf, &offActual, &cSeeks));
-        RTMemPageFree(pbBuf, cbBlock);
+    if (cbBlock <= cbFile)
+    {
+
+        uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBlock);
+        if (pbBuf)
+        {
+            memset(pbBuf, 0xf7, cbBlock);
+            PROFILE_IO_FN("RTFileRead", fsPerfIoReadWorker(hFile1, cbFile, cbBlock, pbBuf, &offActual, &cSeeks));
+            RTMemPageFree(pbBuf, cbBlock);
+        }
+        else
+            RTTestSkipped(g_hTest, "insufficient (virtual) memory available");
     }
     else
-        RTTestSkipped(g_hTest, "insufficient (virtual) memory available");
+        RTTestSkipped(g_hTest, "test file too small");
 }
 
@@ -3186 +3191 @@
     RTTestISubF("IO - Sequential write %RU32", cbBlock);
 
-    uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBlock);
-    if (pbBuf)
-    {
-        memset(pbBuf, 0xf7, cbBlock);
-        PROFILE_IO_FN("RTFileWrite", fsPerfIoWriteWorker(hFile1, cbFile, cbBlock, pbBuf, &offActual, &cSeeks));
-        RTMemPageFree(pbBuf, cbBlock);
+    if (cbBlock <= cbFile)
+    {
+        uint8_t *pbBuf = (uint8_t *)RTMemPageAlloc(cbBlock);
+        if (pbBuf)
+        {
+            memset(pbBuf, 0xf7, cbBlock);
+            PROFILE_IO_FN("RTFileWrite", fsPerfIoWriteWorker(hFile1, cbFile, cbBlock, pbBuf, &offActual, &cSeeks));
+            RTMemPageFree(pbBuf, cbBlock);
+        }
+        else
+            RTTestSkipped(g_hTest, "insufficient (virtual) memory available");
     }
     else
-        RTTestSkipped(g_hTest, "insufficient (virtual) memory available");
+        RTTestSkipped(g_hTest, "test file too small");
 }