Changeset 36131 in vbox for trunk/src

Timestamp:

Mar 2, 2011 9:56:42 PM (14 years ago)

Author:

vboxsync

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

70308

Message:

tstVDIo: Updates

Location:

trunk/src/VBox/Storage/testcase

Files:

• VDIoBackendMem.cpp (modified) (7 diffs)
• tstVDIo.cpp (modified) (10 diffs)
• tstVDShareable.vd (modified) (1 diff)

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

@@ -54 +54 @@
 } VDIOBACKENDREQ, *PVDIOBACKENDREQ;
 
+typedef PVDIOBACKENDREQ *PPVDIOBACKENDREQ;
+
 /**
  * I/O memory backend
@@ -69 +71 @@
     /** Flag whether the the server should be still running. */
     volatile bool fRunning;
+    /** Number of requests waiting in the request buffer. */
+    volatile uint32_t cReqsWaiting;
 } VDIOBACKENDMEM;
 
@@ -93 +97 @@
     if (pIoBackend)
     {
-        rc = RTCircBufCreate(&pIoBackend->pRequestRing, VDMEMIOBACKEND_REQS * sizeof(VDIOBACKENDREQ));
+        rc = RTCircBufCreate(&pIoBackend->pRequestRing, VDMEMIOBACKEND_REQS * sizeof(PVDIOBACKENDREQ));
         if (RT_SUCCESS(rc))
         {
@@ -143 +147 @@
 {
     PVDIOBACKENDREQ pReq = NULL;
+    PPVDIOBACKENDREQ ppReq = NULL;
     size_t cbData;
 
-    RTCircBufAcquireWriteBlock(pIoBackend->pRequestRing, RT_OFFSETOF(VDIOBACKENDREQ, aSegs[cSegs]), (void **)&pReq, &cbData);
+    LogFlowFunc(("Queuing request\n"));
+
+    pReq = (PVDIOBACKENDREQ)RTMemAlloc(RT_OFFSETOF(VDIOBACKENDREQ, aSegs[cSegs]));
     if (!pReq)
         return VERR_NO_MEMORY;
 
-    Assert(cbData == (size_t)RT_OFFSETOF(VDIOBACKENDREQ, aSegs[cSegs]));
+    RTCircBufAcquireWriteBlock(pIoBackend->pRequestRing, sizeof(PVDIOBACKENDREQ), (void **)&ppReq, &cbData);
+    if (!pReq)
+    {
+        RTMemFree(pReq);
+        return VERR_NO_MEMORY;
+    }
+
+    Assert(cbData == sizeof(PVDIOBACKENDREQ));
     pReq->enmTxDir    = enmTxDir;
     pReq->cbTransfer  = cbTransfer;
@@ -162 +176 @@
         pReq->aSegs[i].cbSeg = paSegs[i].cbSeg;
     }
-    RTCircBufReleaseWriteBlock(pIoBackend->pRequestRing, RT_OFFSETOF(VDIOBACKENDREQ, aSegs[cSegs]));
-    vdIoBackendMemThreadPoke(pIoBackend);
+
+    *ppReq = pReq;
+    RTCircBufReleaseWriteBlock(pIoBackend->pRequestRing, sizeof(PVDIOBACKENDREQ));
+    uint32_t cReqsWaiting = ASMAtomicIncU32(&pIoBackend->cReqsWaiting);
+    if (cReqsWaiting == 1)
+        vdIoBackendMemThreadPoke(pIoBackend);
 
     return VINF_SUCCESS;
@@ -187 +205 @@
 
         PVDIOBACKENDREQ pReq;
+        PPVDIOBACKENDREQ ppReq;
         size_t cbData;
-
-        RTCircBufAcquireReadBlock(pIoBackend->pRequestRing, sizeof(VDIOBACKENDREQ), (void **)&pReq, &cbData);
-        Assert(!pReq || cbData == sizeof(VDIOBACKENDREQ));
-
-        while (pReq)
+        uint32_t cReqsWaiting = ASMAtomicXchgU32(&pIoBackend->cReqsWaiting, 0);
+
+        while (cReqsWaiting)
         {
             int rcReq = VINF_SUCCESS;
 
+            /* Do we have another request? */
+            RTCircBufAcquireReadBlock(pIoBackend->pRequestRing, sizeof(PVDIOBACKENDREQ), (void **)&ppReq, &cbData);
+            Assert(!ppReq || cbData == sizeof(PVDIOBACKENDREQ));
+            RTCircBufReleaseReadBlock(pIoBackend->pRequestRing, cbData);
+
+            pReq = *ppReq;
+            cReqsWaiting--;
+
+            LogFlowFunc(("Processing request\n"));
             switch (pReq->enmTxDir)
             {
@@ -220 +246 @@
             /* Notify completion. */
             pReq->pfnComplete(pReq->pvUser, rcReq);
-
-            RTCircBufReleaseReadBlock(pIoBackend->pRequestRing, cbData);
-
-            /* Do we have another request? */
-            RTCircBufAcquireReadBlock(pIoBackend->pRequestRing, sizeof(VDIOBACKENDREQ), (void **)&pReq, &cbData);
-            Assert(!pReq || cbData == sizeof(VDIOBACKENDREQ));
+            RTMemFree(pReq);
         }
     }

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

@@ -17 +17 @@
  */
 #define LOGGROUP LOGGROUP_DEFAULT
-#define RTMEM_WRAP_TO_EF_APIS
 #include <VBox/vd.h>
 #include <VBox/err.h>
@@ -31 +30 @@
 #include <iprt/semaphore.h>
 #include <iprt/thread.h>
+#include <iprt/rand.h>
 
 #include "VDMemDisk.h"
@@ -281 +281 @@
 static DECLCALLBACK(int) vdScriptHandlerDestroyDisk(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 static DECLCALLBACK(int) vdScriptHandlerCompareDisks(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
+static DECLCALLBACK(int) vdScriptHandlerDumpDiskInfo(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 
 /* create action */
@@ -349 +350 @@
     /* pcszName    chId enmType                          fFlags */
     {"size",       'd', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, VDSCRIPTARGDESC_FLAG_MANDATORY | VDSCRIPTARGDESC_FLAG_SIZE_SUFFIX},
-    {"seed",       's', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, VDSCRIPTARGDESC_FLAG_MANDATORY}
+    {"mode",       'm', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
+    {"seed",       's', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, 0}
 };
 
@@ -387 +389 @@
     {"disk1",      '1', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
     {"disk2",      '2', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY}
+};
+
+/* Dump disk info */
+const VDSCRIPTARGDESC g_aArgDumpDiskInfo[] =
+{
+    /* pcszName    chId enmType                          fFlags */
+    {"disk",       'd', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
 };
 
@@ -404 +413 @@
     {"createdisk",   g_aArgCreateDisk,    RT_ELEMENTS(g_aArgCreateDisk),   vdScriptHandlerCreateDisk},
     {"destroydisk",  g_aArgDestroyDisk,   RT_ELEMENTS(g_aArgDestroyDisk),  vdScriptHandlerDestroyDisk},
-    {"comparedisks", g_aArgCompareDisks,  RT_ELEMENTS(g_aArgCompareDisks), vdScriptHandlerCompareDisks}
+    {"comparedisks", g_aArgCompareDisks,  RT_ELEMENTS(g_aArgCompareDisks), vdScriptHandlerCompareDisks},
+    {"dumpdiskinfo", g_aArgDumpDiskInfo,  RT_ELEMENTS(g_aArgDumpDiskInfo), vdScriptHandlerDumpDiskInfo},
 };
 
@@ -982 +992 @@
     size_t cbPattern = 0;
     uint64_t uSeed = 0;
+    const char *pcszSeeder = NULL;
 
     for (unsigned i = 0; i < cScriptArgs; i++)
@@ -995 +1006 @@
             {
                 uSeed = paScriptArgs[i].u.u64;
+                break;
+            }
+            case 'm':
+            {
+                pcszSeeder = paScriptArgs[i].u.pcszString;
                 break;
             }
@@ -1008 +1024 @@
     }
     else
-        rc = VDIoRndCreate(&pGlob->pIoRnd, cbPattern, uSeed);
+    {
+        uint64_t uSeedToUse = 0;
+
+        if (!RTStrICmp(pcszSeeder, "manual"))
+            uSeedToUse = uSeed;
+        else if (!RTStrICmp(pcszSeeder, "time"))
+            uSeedToUse = RTTimeSystemMilliTS();
+        else if (!RTStrICmp(pcszSeeder, "system"))
+        {
+            RTRAND hRand;
+            rc = RTRandAdvCreateSystemTruer(&hRand);
+            if (RT_SUCCESS(rc))
+            {
+                RTRandAdvBytes(hRand, &uSeedToUse, sizeof(uSeedToUse));
+                RTRandAdvDestroy(hRand);
+            }
+        }
+
+        if (RT_SUCCESS(rc))
+            rc = VDIoRndCreate(&pGlob->pIoRnd, cbPattern, uSeed);
+    }
 
     return rc;
@@ -1266 +1302 @@
         }
     }
+    else
+        rc = VERR_NOT_FOUND;
+
+    return rc;
+}
+
+static DECLCALLBACK(int) vdScriptHandlerDumpDiskInfo(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs)
+{
+    int rc = VINF_SUCCESS;
+    const char *pcszDisk = NULL;
+    PVDDISK pDisk = NULL;
+
+    for (unsigned i = 0; i < cScriptArgs; i++)
+    {
+        switch (paScriptArgs[i].chId)
+        {
+            case 'd':
+            {
+                pcszDisk = paScriptArgs[i].u.pcszString;
+                break;
+            }
+            default:
+                AssertMsgFailed(("Invalid argument given!\n"));
+        }
+    }
+
+    pDisk = tstVDIoGetDiskByName(pGlob, pcszDisk);
+
+    if (pDisk)
+        VDDumpImages(pDisk->pVD);
     else
         rc = VERR_NOT_FOUND;

trunk/src/VBox/Storage/testcase/tstVDShareable.vd

@@ -17 +17 @@
 
 # Init I/O RNG for generating random data for writes
-iorngcreate size=10M seed=1234567890
+iorngcreate size=10M mode=manual seed=1234567890
 
 # Create disk containers.