Changeset 66263 in vbox for trunk/src/VBox/Storage

Timestamp:

Mar 27, 2017 11:11:41 AM (8 years ago)

Author:

vboxsync

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

114184

Message:

Storage/tstVDIo: Rename VDIOREQ to TSTVDIOREQ, VDIOREQ will be reused in the near future in the public VD API

File:

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

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

@@ -159 +159 @@
  * Transfer direction.
  */
-typedef enum VDIOREQTXDIR
-{
-    VDIOREQTXDIR_READ = 0,
-    VDIOREQTXDIR_WRITE,
-    VDIOREQTXDIR_FLUSH,
-    VDIOREQTXDIR_DISCARD
-} VDIOREQTXDIR;
+typedef enum TSTVDIOREQTXDIR
+{
+    TSTVDIOREQTXDIR_READ = 0,
+    TSTVDIOREQTXDIR_WRITE,
+    TSTVDIOREQTXDIR_FLUSH,
+    TSTVDIOREQTXDIR_DISCARD
+} TSTVDIOREQTXDIR;
 
 /**
  * I/O request.
  */
-typedef struct VDIOREQ
+typedef struct TSTVDIOREQ
 {
     /** Transfer type. */
-    VDIOREQTXDIR  enmTxDir;
+    TSTVDIOREQTXDIR  enmTxDir;
     /** slot index. */
-    unsigned      idx;
+    unsigned         idx;
     /** Start offset. */
-    uint64_t      off;
+    uint64_t         off;
     /** Size to transfer. */
-    size_t        cbReq;
+    size_t           cbReq;
     /** S/G Buffer */
-    RTSGBUF       SgBuf;
+    RTSGBUF          SgBuf;
     /** Flag whether the request is outstanding or not. */
-    volatile bool fOutstanding;
+    volatile bool    fOutstanding;
     /** Buffer to use for reads. */
-    void          *pvBufRead;
+    void             *pvBufRead;
     /** Contiguous buffer pointer backing the segments. */
-    void          *pvBuf;
+    void             *pvBuf;
     /** Opaque user data. */
-    void          *pvUser;
+    void             *pvUser;
     /** Number of segments used for the data buffer. */
-    uint32_t      cSegs;
+    uint32_t         cSegs;
     /** Array of data segments. */
-    RTSGSEG       aSegs[10];
-} VDIOREQ, *PVDIOREQ;
+    RTSGSEG          aSegs[10];
+} TSTVDIOREQ, *PTSTVDIOREQ;
 
 /**
@@ -543 +543 @@
 static bool tstVDIoTestRunning(PVDIOTEST pIoTest);
 static void tstVDIoTestDestroy(PVDIOTEST pIoTest);
-static bool tstVDIoTestReqOutstanding(PVDIOREQ pIoReq);
-static int  tstVDIoTestReqInit(PVDIOTEST pIoTest, PVDIOREQ pIoReq, void *pvUser);
+static bool tstVDIoTestReqOutstanding(PTSTVDIOREQ pIoReq);
+static int  tstVDIoTestReqInit(PVDIOTEST pIoTest, PTSTVDIOREQ pIoReq, void *pvUser);
 static DECLCALLBACK(void) tstVDIoTestReqComplete(void *pvUser1, void *pvUser2, int rcReq);
 
@@ -765 +765 @@
         if (RT_SUCCESS(rc))
         {
-            PVDIOREQ paIoReq = NULL;
+            PTSTVDIOREQ paIoReq = NULL;
             unsigned cMaxTasksOutstanding = fAsync ? cMaxReqs : 1;
             RTSEMEVENT EventSem;
 
             rc = RTSemEventCreate(&EventSem);
-            paIoReq = (PVDIOREQ)RTMemAllocZ(cMaxTasksOutstanding * sizeof(VDIOREQ));
+            paIoReq = (PTSTVDIOREQ)RTMemAllocZ(cMaxTasksOutstanding * sizeof(TSTVDIOREQ));
             if (paIoReq && RT_SUCCESS(rc))
             {
@@ -808 +808 @@
                                     switch (paIoReq[idx].enmTxDir)
                                     {
-                                        case VDIOREQTXDIR_READ:
+                                        case TSTVDIOREQTXDIR_READ:
                                         {
                                             rc = VDRead(pDisk->pVD, paIoReq[idx].off, paIoReq[idx].aSegs[0].pvSeg, paIoReq[idx].cbReq);
@@ -826 +826 @@
                                             break;
                                         }
-                                        case VDIOREQTXDIR_WRITE:
+                                        case TSTVDIOREQTXDIR_WRITE:
                                         {
                                             rc = VDWrite(pDisk->pVD, paIoReq[idx].off, paIoReq[idx].aSegs[0].pvSeg, paIoReq[idx].cbReq);
@@ -839 +839 @@
                                             break;
                                         }
-                                        case VDIOREQTXDIR_FLUSH:
+                                        case TSTVDIOREQTXDIR_FLUSH:
                                         {
                                             rc = VDFlush(pDisk->pVD);
                                             break;
                                         }
-                                        case VDIOREQTXDIR_DISCARD:
+                                        case TSTVDIOREQTXDIR_DISCARD:
                                             AssertMsgFailed(("Invalid\n"));
                                     }
@@ -857 +857 @@
                                     switch (paIoReq[idx].enmTxDir)
                                     {
-                                        case VDIOREQTXDIR_READ:
+                                        case TSTVDIOREQTXDIR_READ:
                                         {
                                             rc = VDAsyncRead(pDisk->pVD, paIoReq[idx].off, paIoReq[idx].cbReq, &paIoReq[idx].SgBuf,
@@ -863 +863 @@
                                             break;
                                         }
-                                        case VDIOREQTXDIR_WRITE:
+                                        case TSTVDIOREQTXDIR_WRITE:
                                         {
                                             rc = VDAsyncWrite(pDisk->pVD, paIoReq[idx].off, paIoReq[idx].cbReq, &paIoReq[idx].SgBuf,
@@ -869 +869 @@
                                             break;
                                         }
-                                        case VDIOREQTXDIR_FLUSH:
+                                        case TSTVDIOREQTXDIR_FLUSH:
                                         {
                                             rc = VDAsyncFlush(pDisk->pVD, tstVDIoTestReqComplete, &paIoReq[idx], EventSem);
                                             break;
                                         }
-                                        case VDIOREQTXDIR_DISCARD:
+                                        case TSTVDIOREQTXDIR_DISCARD:
                                             AssertMsgFailed(("Invalid\n"));
                                     }
@@ -889 +889 @@
                                         switch (paIoReq[idx].enmTxDir)
                                         {
-                                            case VDIOREQTXDIR_READ:
+                                            case TSTVDIOREQTXDIR_READ:
                                             {
                                                 if (pDisk->pMemDiskVerify)
@@ -906 +906 @@
                                                 break;
                                             }
-                                            case VDIOREQTXDIR_WRITE:
+                                            case TSTVDIOREQTXDIR_WRITE:
                                             {
                                                 if (pDisk->pMemDiskVerify)
@@ -919 +919 @@
                                                 break;
                                             }
-                                            case VDIOREQTXDIR_FLUSH:
+                                            case TSTVDIOREQTXDIR_FLUSH:
                                                 break;
-                                            case VDIOREQTXDIR_DISCARD:
+                                            case TSTVDIOREQTXDIR_DISCARD:
                                                 AssertMsgFailed(("Invalid\n"));
                                         }
@@ -1016 +1016 @@
         else if (fAsync)
         {
-            VDIOREQ IoReq;
+            TSTVDIOREQ IoReq;
             RTSEMEVENT EventSem;
 
@@ -1022 +1022 @@
             if (RT_SUCCESS(rc))
             {
-                memset(&IoReq, 0, sizeof(VDIOREQ));
-                IoReq.enmTxDir = VDIOREQTXDIR_FLUSH;
+                memset(&IoReq, 0, sizeof(TSTVDIOREQ));
+                IoReq.enmTxDir = TSTVDIOREQTXDIR_FLUSH;
                 IoReq.pvUser   = pDisk;
                 IoReq.idx      = 0;
@@ -1247 +1247 @@
             else
             {
-                VDIOREQ IoReq;
+                TSTVDIOREQ IoReq;
                 RTSEMEVENT EventSem;
 
@@ -1253 +1253 @@
                 if (RT_SUCCESS(rc))
                 {
-                    memset(&IoReq, 0, sizeof(VDIOREQ));
-                    IoReq.enmTxDir = VDIOREQTXDIR_FLUSH;
+                    memset(&IoReq, 0, sizeof(TSTVDIOREQ));
+                    IoReq.enmTxDir = TSTVDIOREQTXDIR_FLUSH;
                     IoReq.pvUser   = pDisk;
                     IoReq.idx      = 0;
@@ -2426 +2426 @@
 }
 
-static bool tstVDIoTestReqOutstanding(PVDIOREQ pIoReq)
+static bool tstVDIoTestReqOutstanding(PTSTVDIOREQ pIoReq)
 {
     return pIoReq->fOutstanding;
@@ -2474 +2474 @@
 }
 
-static int tstVDIoTestReqInit(PVDIOTEST pIoTest, PVDIOREQ pIoReq, void *pvUser)
+static int tstVDIoTestReqInit(PVDIOTEST pIoTest, PTSTVDIOREQ pIoReq, void *pvUser)
 {
     int rc = VINF_SUCCESS;
@@ -2481 +2481 @@
     {
         /* Read or Write? */
-        pIoReq->enmTxDir = tstVDIoTestIsTrue(pIoTest, pIoTest->uWriteChance) ? VDIOREQTXDIR_WRITE : VDIOREQTXDIR_READ;
+        pIoReq->enmTxDir = tstVDIoTestIsTrue(pIoTest, pIoTest->uWriteChance) ? TSTVDIOREQTXDIR_WRITE : TSTVDIOREQTXDIR_READ;
         pIoReq->cbReq = RT_MIN(pIoTest->cbBlkIo, pIoTest->cbIo);
         pIoTest->cbIo -= pIoReq->cbReq;
@@ -2487 +2487 @@
         void *pvBuf = NULL;
 
-        if (pIoReq->enmTxDir == VDIOREQTXDIR_WRITE)
+        if (pIoReq->enmTxDir == TSTVDIOREQTXDIR_WRITE)
         {
             if (pIoTest->pPattern)
@@ -2575 +2575 @@
 {
     RT_NOREF1(rcReq);
-    PVDIOREQ pIoReq = (PVDIOREQ)pvUser1;
+    PTSTVDIOREQ pIoReq = (PTSTVDIOREQ)pvUser1;
     RTSEMEVENT hEventSem = (RTSEMEVENT)pvUser2;
     PVDDISK pDisk = (PVDDISK)pIoReq->pvUser;
@@ -2585 +2585 @@
         switch (pIoReq->enmTxDir)
         {
-            case VDIOREQTXDIR_READ:
+            case TSTVDIOREQTXDIR_READ:
             {
                 RTCritSectEnter(&pDisk->CritSectVerify);
@@ -2601 +2601 @@
                 break;
             }
-            case VDIOREQTXDIR_WRITE:
+            case TSTVDIOREQTXDIR_WRITE:
             {
                 RTCritSectEnter(&pDisk->CritSectVerify);
@@ -2617 +2617 @@
                 break;
             }
-            case VDIOREQTXDIR_FLUSH:
-            case VDIOREQTXDIR_DISCARD:
+            case TSTVDIOREQTXDIR_FLUSH:
+            case TSTVDIOREQTXDIR_DISCARD:
                 break;
         }