Changeset 38462 in vbox for trunk/src

Timestamp:

Aug 15, 2011 4:23:31 PM (14 years ago)

Author:

vboxsync

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

73512

Message:

tstVDIo: Updates

File:

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

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

@@ -302 +302 @@
 static DECLCALLBACK(int) vdScriptHandlerCopy(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 static DECLCALLBACK(int) vdScriptHandlerClose(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
+static DECLCALLBACK(int) vdScriptHandlerPrintFileSize(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 static DECLCALLBACK(int) vdScriptHandlerIoRngCreate(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
 static DECLCALLBACK(int) vdScriptHandlerIoRngDestroy(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs);
@@ -334 +335 @@
     {"name",       'n', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
     {"backend",    'b', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
+    {"async",      'a', VDSCRIPTARGTYPE_BOOL,            0},
     {"shareable",  's', VDSCRIPTARGTYPE_BOOL,            0},
     {"readonly",   'r', VDSCRIPTARGTYPE_BOOL,            0}
@@ -402 +404 @@
 };
 
+/* print file size action */
+const VDSCRIPTARGDESC g_aArgPrintFileSize[] =
+{
+    /* pcszName    chId enmType                          fFlags */
+    {"disk",       'd', VDSCRIPTARGTYPE_STRING,          VDSCRIPTARGDESC_FLAG_MANDATORY},
+    {"image",      'i', VDSCRIPTARGTYPE_UNSIGNED_NUMBER, VDSCRIPTARGDESC_FLAG_MANDATORY}
+};
+
 /* I/O RNG create action */
 const VDSCRIPTARGDESC g_aArgIoRngCreate[] =
@@ -495 +505 @@
     {"flush",                      g_aArgFlush,                       RT_ELEMENTS(g_aArgFlush),                      vdScriptHandlerFlush},
     {"close",                      g_aArgClose,                       RT_ELEMENTS(g_aArgClose),                      vdScriptHandlerClose},
+    {"printfilesize",              g_aArgPrintFileSize,               RT_ELEMENTS(g_aArgPrintFileSize),              vdScriptHandlerPrintFileSize},
     {"merge",                      g_aArgMerge,                       RT_ELEMENTS(g_aArgMerge),                      vdScriptHandlerMerge},
     {"compact",                    g_aArgCompact,                     RT_ELEMENTS(g_aArgCompact),                    vdScriptHandlerCompact},
@@ -646 +657 @@
     bool fShareable = false;
     bool fReadonly = false;
+    bool fAsyncIo  = true;
 
     for (unsigned i = 0; i < cScriptArgs; i++)
@@ -674 +686 @@
             {
                 fReadonly = paScriptArgs[i].u.fFlag;
+                break;
+            }
+            case 'a':
+            {
+                fAsyncIo = paScriptArgs[i].u.fFlag;
                 break;
             }
@@ -689 +706 @@
         if (pDisk)
         {
-            unsigned fOpenFlags = VD_OPEN_FLAGS_ASYNC_IO;
-
+            unsigned fOpenFlags = 0;
+
+            if (fAsyncIo)
+                fOpenFlags |= VD_OPEN_FLAGS_ASYNC_IO;
             if (fShareable)
                 fOpenFlags |= VD_OPEN_FLAGS_SHAREABLE;
@@ -788 +807 @@
             break;
     }
+
+    if (   RT_SUCCESS(rc)
+        && fAsync
+        && !cMaxReqs)
+        rc = VERR_INVALID_PARAMETER;
 
     if (RT_SUCCESS(rc))
@@ -1366 +1390 @@
             rc = VERR_NOT_FOUND;
     }
+    return rc;
+}
+
+
+static DECLCALLBACK(int) vdScriptHandlerPrintFileSize(PVDTESTGLOB pGlob, PVDSCRIPTARG paScriptArgs, unsigned cScriptArgs)
+{
+    int rc = VINF_SUCCESS;
+    const char *pcszDisk = NULL;
+    PVDDISK pDisk = NULL;
+    unsigned nImage = 0;
+
+    for (unsigned i = 0; i < cScriptArgs; i++)
+    {
+        switch (paScriptArgs[i].chId)
+        {
+            case 'd':
+            {
+                pcszDisk = paScriptArgs[i].u.pcszString;
+                break;
+            }
+            case 'i':
+            {
+                nImage = (unsigned)paScriptArgs[i].u.u64;
+                break;
+            }
+            default:
+                AssertMsgFailed(("Invalid argument given!\n"));
+        }
+    }
+
+    pDisk = tstVDIoGetDiskByName(pGlob, pcszDisk);
+    if (pDisk)
+        RTPrintf("%s: size of image %u is %llu\n", pcszDisk, nImage, VDGetFileSize(pDisk->pVD, nImage));
+    else
+        rc = VERR_NOT_FOUND;
+
     return rc;
 }