Changeset 43625 in vbox

Timestamp:

Oct 11, 2012 8:56:27 PM (12 years ago)

Author:

vboxsync

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

81345

Message:

Bug fixes

File:

• trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp

@@ -83 +83 @@
 static const DBGCCMD g_aCmds[] =
 {
-    /* pszCmd,       cArgsMin, cArgsMax, paArgDesc,                cArgDescs, fFlags, pfnHandler              pszSyntax, ....pszDescription */
-    { "injecterror",        3, 3,        &g_aInjectErrorArgs[0],           3,      0, pdmacEpFileErrorInject, "",        "Inject error into I/O subsystem." }
+    /* pszCmd,       cArgsMin, cArgsMax, paArgDesc,                                    cArgDescs, fFlags, pfnHandler              pszSyntax,.pszDescription */
+    { "injecterror",        3, 3,        &g_aInjectErrorArgs[0],                               3,      0, pdmacEpFileErrorInject, "",        "Inject error into I/O subsystem." }
 # ifdef PDM_ASYNC_COMPLETION_FILE_WITH_DELAY
-    ,{ "injectdelay",        4, 4,        &g_aInjectDelayArgs[0],           4,      0, pdmacEpFileDelayInject, "",        "Inject a delay of a request." }
+    ,{ "injectdelay",       3, 5,        &g_aInjectDelayArgs[0], RT_ELEMENTS(g_aInjectDelayArgs),      0, pdmacEpFileDelayInject, "",        "Inject a delay of a request." }
 # endif
 };
@@ -340 +340 @@
                 && ASMAtomicReadU32(&pEpFile->cReqsDelay) > 0)
             {
-                uint64_t tsDelay = (RTRandU32() % 100) > 50 ? pEpFile->msDelay + (RTRandU32() % pEpFile->msJitter)
-                                                            : pEpFile->msDelay - (RTRandU32() % pEpFile->msJitter);
+                uint64_t tsDelay = pEpFile->msDelay;
+
+                if (pEpFile->msJitter)
+                    tsDelay = (RTRandU32() % 100) > 50 ? pEpFile->msDelay + (RTRandU32() % pEpFile->msJitter)
+                                                       : pEpFile->msDelay - (RTRandU32() % pEpFile->msJitter);
                 ASMAtomicDecU32(&pEpFile->cReqsDelay);
 
@@ -709 +712 @@
     uint32_t cReqsDelay = 1;
     uint32_t msJitter = 0;
-    if (cArgs == 4)
+    if (cArgs >= 4)
         msJitter = (uint32_t)pArgs[3].u.u64Number;
     if (cArgs == 5)