Changeset 35671 in vbox

Timestamp:

Jan 21, 2011 8:20:08 PM (14 years ago)

Author:

vboxsync

Message:

Storeage/tstVDIo: Fixes

File:

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

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

@@ -1 @@
-/* $Id  */
+/* $Id$ */
 /** @file
  *
@@ -110 +110 @@
     /** Flag whether the request is outstanding or not. */
     volatile bool fOutstanding;
+    /** Buffer to use for reads. */
+    void          *pvBufRead;
 } VDIOREQ, *PVDIOREQ;
 
@@ -126 +128 @@
     size_t      cbBlkIo;
     /** Number of bytes to transfer. */
-    size_t      cbIo;
+    uint64_t    cbIo;
     /** Chance in percent to get a write. */
     unsigned    uWriteChance;
@@ -143 +145 @@
             /** Pointer to the bitmap marking accessed blocks. */
             uint8_t *pbMapAccessed;
+            /** Number of unaccessed blocks. */
+            uint32_t cBlocksLeft;
         } Rnd;
     } u;
@@ -357 +361 @@
 }
 
-static int tstVDIoTestInit(PVDIOTEST pIoTest, PVDTESTGLOB pGlob, bool fRandomAcc, size_t cbIo,
+static int tstVDIoTestInit(PVDIOTEST pIoTest, PVDTESTGLOB pGlob, bool fRandomAcc, uint64_t cbIo,
                            size_t cbBlkSize, uint64_t offStart, uint64_t offEnd,
                            unsigned uWriteChance, unsigned uReadChance);
@@ -562 +566 @@
                 uint64_t NanoTS = RTTimeNanoTS();
 
+                /* Init requests. */
                 for (unsigned i = 0; i < cMaxTasksOutstanding; i++)
+                {
                     paIoReq[i].idx = i;
-
-                while (tstVDIoTestRunning(&IoTest))
+                    paIoReq[i].pvBufRead = RTMemAlloc(cbBlkSize);
+                    if (!paIoReq[i].pvBufRead)
+                    {
+                        rc = VERR_NO_MEMORY;
+                        break;
+                    }
+                }
+
+                while (   tstVDIoTestRunning(&IoTest)
+                       && RT_SUCCESS(rc))
                 {
                     bool fTasksOutstanding = false;
@@ -588 +602 @@
                                         {
                                             rc = VDRead(pGlob->pVD, paIoReq[idx].off, paIoReq[idx].DataSeg.pvSeg, paIoReq[idx].cbReq);
-                                            RTMemFree(paIoReq[idx].DataSeg.pvSeg);
                                             break;
                                         }
@@ -613 +626 @@
                                             rc = VDAsyncRead(pGlob->pVD, paIoReq[idx].off, paIoReq[idx].cbReq, &paIoReq[idx].SgBuf,
                                                              tstVDIoTestReqComplete, &paIoReq[idx], EventSem);
-                                            if (rc == VINF_VD_ASYNC_IO_FINISHED)
-                                                RTMemFree(paIoReq[idx].DataSeg.pvSeg);
                                             break;
                                         }
@@ -1170 +1181 @@
 }
 
-static int tstVDIoTestInit(PVDIOTEST pIoTest, PVDTESTGLOB pGlob, bool fRandomAcc, size_t cbIo,
+static int tstVDIoTestInit(PVDIOTEST pIoTest, PVDTESTGLOB pGlob, bool fRandomAcc, uint64_t cbIo,
                            size_t cbBlkSize, uint64_t offStart, uint64_t offEnd,
                            unsigned uWriteChance, unsigned uReadChance)
@@ -1183 +1194 @@
     pIoTest->uWriteChance  = uWriteChance;
     pIoTest->pIoRnd        = pGlob->pIoRnd;
+
     if (fRandomAcc)
     {
-        pIoTest->u.Rnd.cBlocks = cbIo / cbBlkSize + ((cbIo % cbBlkSize) ? 1 : 0);
+        uint64_t cbRange = pIoTest->offEnd < pIoTest->offStart
+                           ? pIoTest->offStart - pIoTest->offEnd
+                           : pIoTest->offEnd - pIoTest->offStart;
+
+        pIoTest->u.Rnd.cBlocks = cbRange / cbBlkSize + ((cbRange % cbBlkSize) ? 1 : 0);
+        pIoTest->u.Rnd.cBlocksLeft = pIoTest->u.Rnd.cBlocks;
         pIoTest->u.Rnd.pbMapAccessed = (uint8_t *)RTMemAllocZ(pIoTest->u.Rnd.cBlocks / 8
                                                               + ((pIoTest->u.Rnd.cBlocks % 8)
@@ -1248 +1265 @@
         {
             /* Read */
-            pIoReq->DataSeg.pvSeg = RTMemAlloc(pIoReq->cbReq);
-            if (!pIoReq->DataSeg.pvSeg)
-                rc = VERR_NO_MEMORY;
+            pIoReq->DataSeg.pvSeg = pIoReq->pvBufRead;
         }
 
@@ -1264 +1279 @@
 
                 /* In case this is the last request we don't need to search further. */
-                if (pIoTest->cbIo > 0)
+                if (pIoTest->u.Rnd.cBlocksLeft > 1)
                 {
                     int idxIo;
@@ -1285 +1300 @@
                 Assert(idx != -1);
                 pIoReq->off = idx * pIoTest->cbBlkIo;
-                ASMBitSet(pIoTest->u.Rnd.pbMapAccessed, idx);
+                pIoTest->u.Rnd.cBlocksLeft--;
+                if (!pIoTest->u.Rnd.cBlocksLeft)
+                {
+                    /* New round, clear everthing. */
+                    ASMBitClearRange(pIoTest->u.Rnd.pbMapAccessed, 0, pIoTest->u.Rnd.cBlocks);
+                    pIoTest->u.Rnd.cBlocksLeft = pIoTest->u.Rnd.cBlocks;
+                }
+                else
+                    ASMBitSet(pIoTest->u.Rnd.pbMapAccessed, idx);
             }
             else
             {
-                pIoReq->off        = pIoTest->u.offNext;
-                pIoTest->u.offNext = pIoTest->offEnd < pIoTest->offStart
-                                     ? RT_MAX(pIoTest->offEnd, pIoTest->u.offNext - pIoTest->cbBlkIo)
-                                     : RT_MIN(pIoTest->offEnd, pIoTest->u.offNext + pIoTest->cbBlkIo);
+                pIoReq->off = pIoTest->u.offNext;
+                if (pIoTest->offEnd < pIoTest->offStart)
+                {
+                    pIoTest->u.offNext = pIoTest->u.offNext == 0
+                                         ? pIoTest->offEnd - pIoTest->cbBlkIo
+                                         : RT_MAX(pIoTest->offEnd, pIoTest->u.offNext - pIoTest->cbBlkIo);
+                }
+                else
+                {
+                    pIoTest->u.offNext = pIoTest->u.offNext + pIoTest->cbBlkIo >= pIoTest->offEnd
+                                         ? 0
+                                         : RT_MIN(pIoTest->offEnd, pIoTest->u.offNext + pIoTest->cbBlkIo);
+                }
             }
             pIoReq->fOutstanding = true;