Changeset 52371 in vbox for trunk/src/VBox/Storage/testcase/tstVDIo.cpp

Timestamp:

Aug 13, 2014 7:00:27 PM (11 years ago)

Author:

vboxsync

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

95511

Message:

Storage/tstVDIo: Plug leaks, modifications and start turning it into a proper testcase for unit tests

File:

• trunk/src/VBox/Storage/testcase/tstVDIo.cpp (modified) (24 diffs)

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2011-2013 Oracle Corporation
+ * Copyright (C) 2011-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 #include <iprt/rand.h>
 #include <iprt/critsect.h>
+#include <iprt/test.h>
 
 #include "VDMemDisk.h"
@@ -40 +41 @@
 #include "VDScript.h"
 #include "BuiltinTests.h"
+
+/** forward declaration for the global test data pointer. */
+typedef struct VDTESTGLOB *PVDTESTGLOB;
 
 /**
@@ -100 +104 @@
     /** Logical CHS geometry. */
     VDGEOMETRY     LogicalGeom;
+    /** Global test data. */
+    PVDTESTGLOB    pTestGlob;
 } VDDISK, *PVDDISK;
 
@@ -142 +148 @@
     /** Current storage backend to use. */
     char            *pszIoBackend;
-} VDTESTGLOB, *PVDTESTGLOB;
+    /** Testcase handle. */
+    RTTEST           hTest;
+} VDTESTGLOB;
 
 /**
@@ -256 +264 @@
     VDSCRIPTTYPE_STRING,
     VDSCRIPTTYPE_UINT64,
+    VDSCRIPTTYPE_BOOL,
     VDSCRIPTTYPE_BOOL
 };
@@ -269 +278 @@
     VDSCRIPTTYPE_BOOL,   /* readonly */
     VDSCRIPTTYPE_BOOL,   /* discard */
-    VDSCRIPTTYPE_BOOL    /* ignoreflush */
+    VDSCRIPTTYPE_BOOL,   /* ignoreflush */
+    VDSCRIPTTYPE_BOOL,   /* honorsame */
 };
 
@@ -533 +543 @@
     bool fDynamic = true;
     bool fIgnoreFlush = false;
+    bool fHonorSame = false;
     PVDIOBACKEND pIoBackend = NULL;
 
@@ -558 +569 @@
     cbSize = paScriptArgs[5].u64;
     fIgnoreFlush = paScriptArgs[6].f;
+    fHonorSame = paScriptArgs[7].f;
 
     if (RT_SUCCESS(rc))
@@ -572 +584 @@
             if (fIgnoreFlush)
                 fOpenFlags |= VD_OPEN_FLAGS_IGNORE_FLUSH;
+
+            if (fHonorSame)
+                fOpenFlags |= VD_OPEN_FLAGS_HONOR_SAME;
 
             if (fBase)
@@ -601 +616 @@
     bool fDiscard  = false;
     bool fIgnoreFlush = false;
+    bool fHonorSame = false;
 
     pcszDisk = paScriptArgs[0].psz;
@@ -609 +625 @@
     fAsyncIo = paScriptArgs[5].f;
     fDiscard = paScriptArgs[6].f;
+    fIgnoreFlush = paScriptArgs[7].f;
+    fHonorSame = paScriptArgs[8].f;
 
     if (RT_SUCCESS(rc))
@@ -627 +645 @@
             if (fIgnoreFlush)
                 fOpenFlags |= VD_OPEN_FLAGS_IGNORE_FLUSH;
+            if (fHonorSame)
+                fOpenFlags |= VD_OPEN_FLAGS_HONOR_SAME;
 
             rc = VDOpen(pDisk->pVD, pcszBackend, pcszImage, fOpenFlags, pGlob->pInterfacesImages);
@@ -713 +733 @@
         VDIOTEST IoTest;
 
+        RTTestSub(pGlob->hTest, "Basic I/O");
         rc = tstVDIoTestInit(&IoTest, pGlob, fRandomAcc, cbIo, cbBlkSize, offStart, offEnd, uWriteChance, pPattern);
         if (RT_SUCCESS(rc))
@@ -771 +792 @@
                                                 if (VDMemDiskCmp(pDisk->pMemDiskVerify, paIoReq[idx].off, paIoReq[idx].cbReq, &SgBuf))
                                                 {
-                                                    RTPrintf("Corrupted disk at offset %llu!\n", paIoReq[idx].off);
+                                                    RTTestFailed(pGlob->hTest, "Corrupted disk at offset %llu!\n", paIoReq[idx].off);
                                                     rc = VERR_INVALID_STATE;
                                                 }
@@ -850 +871 @@
                                                                      &paIoReq[idx].SgBuf))
                                                     {
-                                                        RTPrintf("Corrupted disk at offset %llu!\n", paIoReq[idx].off);
+                                                        RTTestFailed(pGlob->hTest, "Corrupted disk at offset %llu!\n", paIoReq[idx].off);
                                                         rc = VERR_INVALID_STATE;
                                                     }
@@ -924 +945 @@
                 NanoTS = RTTimeNanoTS() - NanoTS;
                 uint64_t SpeedKBs = (uint64_t)(cbIo / (NanoTS / 1000000000.0) / 1024);
-                RTPrintf("I/O Test: Throughput %lld kb/s\n", SpeedKBs);
+                RTTestValue(pGlob->hTest, "Throughput", SpeedKBs, RTTESTUNIT_KILOBYTES_PER_SEC);
+
+                for (unsigned i = 0; i < cMaxTasksOutstanding; i++)
+                {
+                    if (paIoReq[i].pvBufRead)
+                        RTMemFree(paIoReq[i].pvBufRead);
+                }
 
                 RTSemEventDestroy(EventSem);
@@ -1746 +1773 @@
         if (pDisk)
         {
+            pDisk->pTestGlob = pGlob;
             pDisk->pszName = RTStrDup(pcszDisk);
             if (pDisk->pszName)
@@ -1846 +1874 @@
             cbDisk2 = VDGetSize(pDisk2->pVD, VD_LAST_IMAGE);
 
+            RTTestSub(pGlob->hTest, "Comparing two disks for equal content");
             if (cbDisk1 != cbDisk2)
-                RTPrintf("Disks differ in size %llu vs %llu\n", cbDisk1, cbDisk2);
+                RTTestFailed(pGlob->hTest, "Disks differ in size %llu vs %llu\n", cbDisk1, cbDisk2);
             else
             {
@@ -1862 +1891 @@
                         if (memcmp(pbBuf1, pbBuf2, cbRead))
                         {
-                            RTPrintf("Disks differ at offset %llu\n", uOffCur);
+                            RTTestFailed(pGlob->hTest, "Disks differ at offset %llu\n", uOffCur);
                             rc = VERR_DEV_IO_ERROR;
                             break;
@@ -1869 +1898 @@
                     else
                     {
-                        RTPrintf("Reading one disk at offset %llu failed\n", uOffCur);
+                        RTTestFailed(pGlob->hTest, "Reading one disk at offset %llu failed\n", uOffCur);
                         break;
                     }
@@ -2517 +2546 @@
                 if (VDMemDiskCmp(pDisk->pMemDiskVerify, pIoReq->off, pIoReq->cbReq,
                                  &pIoReq->SgBuf))
-                    RTPrintf("Corrupted disk at offset %llu!\n", pIoReq->off);
+                    RTTestFailed(pDisk->pTestGlob->hTest, "Corrupted disk at offset %llu!\n", pIoReq->off);
                 RTCritSectLeave(&pDisk->CritSectVerify);
             }
@@ -2697 +2726 @@
     AssertRC(rc);
 
-    /* Init I/O backend. */
-    rc = VDIoBackendCreate(&GlobTest.pIoBackend);
+    rc = RTTestCreate("tstVDIo", &GlobTest.hTest);
     if (RT_SUCCESS(rc))
     {
-        VDSCRIPTCTX hScriptCtx = NULL;
-        rc = VDScriptCtxCreate(&hScriptCtx);
+        /* Init I/O backend. */
+        rc = VDIoBackendCreate(&GlobTest.pIoBackend);
         if (RT_SUCCESS(rc))
         {
-            rc = VDScriptCtxCallbacksRegister(hScriptCtx, g_aScriptActions, g_cScriptActions, &GlobTest);
-            AssertRC(rc);
-
-            rc = VDScriptCtxLoadScript(hScriptCtx, pszScript);
-            if (RT_FAILURE(rc))
+            VDSCRIPTCTX hScriptCtx = NULL;
+            rc = VDScriptCtxCreate(&hScriptCtx);
+            if (RT_SUCCESS(rc))
             {
-                RTPrintf("Loading the script failed rc=%Rrc\n", rc);
+                RTTEST_CHECK_RC_OK(GlobTest.hTest,
+                                   VDScriptCtxCallbacksRegister(hScriptCtx, g_aScriptActions, g_cScriptActions, &GlobTest));
+
+                RTTestBanner(GlobTest.hTest);
+                rc = VDScriptCtxLoadScript(hScriptCtx, pszScript);
+                if (RT_FAILURE(rc))
+                {
+                    RTPrintf("Loading the script failed rc=%Rrc\n", rc);
+                }
+                else
+                    rc = VDScriptCtxCallFn(hScriptCtx, "main", NULL, 0);
+                VDScriptCtxDestroy(hScriptCtx);
             }
-            else
-                rc = VDScriptCtxCallFn(hScriptCtx, "main", NULL, 0);
-            VDScriptCtxDestroy(hScriptCtx);
-        }
-        VDIoBackendDestroy(GlobTest.pIoBackend);
-    }
-    else
-        RTPrintf("Creating the I/O backend failed rc=%Rrc\n");
+            VDIoBackendDestroy(GlobTest.pIoBackend);
+        }
+        else
+            RTPrintf("Creating the I/O backend failed rc=%Rrc\n");
+
+        RTTestSummaryAndDestroy(GlobTest.hTest);
+    }
+    else
+        RTStrmPrintf(g_pStdErr, "tstVDIo: fatal error: RTTestCreate failed with rc=%Rrc\n", rc);
 
     RTStrFree(GlobTest.pszIoBackend);
@@ -2746 +2784 @@
         AssertPtr(pszScript);
         tstVDIoScriptExec(pszScript);
+        RTStrFree(pszScript);
     }
     else