Changeset 41469 in vbox for trunk/src

Timestamp:

May 28, 2012 10:58:48 PM (13 years ago)

Author:

vboxsync

Message:

AsyncCompletion: enhance injectdelay debugger command to delay multiple requests at once

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/PDMAsyncCompletionFile.cpp (modified) (9 diffs)
• include/PDMAsyncCompletionFileInternal.h (modified) (3 diffs)

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

@@ -44 +44 @@
 #include "PDMAsyncCompletionFileInternal.h"
 
-
 /*******************************************************************************
 *   Internal Functions                                                         *
@@ -71 +70 @@
 {
     /* cTimesMin,   cTimesMax,  enmCategory,            fFlags,                         pszName,        pszDescription */
-    {  1,           1,          DBGCVAR_CAT_STRING,     0,                              "direction",    "write/read." },
+    {  1,           1,          DBGCVAR_CAT_STRING,     0,                              "direction",    "write|read|flush|any." },
     {  1,           1,          DBGCVAR_CAT_STRING,     0,                              "filename",     "Filename." },
     {  1,           1,          DBGCVAR_CAT_NUMBER,     0,                              "delay",        "Delay in milliseconds." },
+    {  1,           1,          DBGCVAR_CAT_NUMBER,     0,                              "reqs",         "Number of requests to delay." },
 };
 # endif
@@ -83 +83 @@
     { "injecterror",        3, 3,        &g_aInjectErrorArgs[0],           3,      0, pdmacEpFileErrorInject, "",        "Inject error into I/O subsystem." }
 # ifdef PDM_ASYNC_COMPLETION_FILE_WITH_DELAY
-    ,{ "injectdelay",        3, 3,        &g_aInjectDelayArgs[0],           3,      0, pdmacEpFileDelayInject, "",        "Inject a delay of a request." }
+    ,{ "injectdelay",        4, 4,        &g_aInjectDelayArgs[0],           4,      0, pdmacEpFileDelayInject, "",        "Inject a delay of a request." }
 # endif
 };
@@ -334 +334 @@
             /* Check if we should delay completion of the request. */
             if (   ASMAtomicReadU32(&pEpFile->msDelay) > 0
-                && ASMAtomicCmpXchgPtr(&pEpFile->pReqDelayed, pTaskFile, NULL))
+                && ASMAtomicReadU32(&pEpFile->cReqsDelay) > 0)
             {
+                ASMAtomicDecU32(&pEpFile->cReqsDelay);
+
                 /* Arm the delay. */
-                pEpFile->tsDelayEnd = RTTimeProgramMilliTS() + pEpFile->msDelay;
+                pTaskFile->tsDelayEnd = RTTimeProgramMilliTS() + pEpFile->msDelay;
+
+                /* Append to the list. */
+                PPDMASYNCCOMPLETIONTASKFILE pHead = NULL;
+                do
+                {
+                    pHead = ASMAtomicReadPtrT(&pEpFile->pDelayedHead, PPDMASYNCCOMPLETIONTASKFILE);
+                    pTaskFile->pDelayedNext = pHead;
+                } while (!ASMAtomicCmpXchgPtr(&pEpFile->pDelayedHead, pTaskFile, pHead));
+
                 LogRel(("AIOMgr: Delaying request %#p for %u ms\n", pTaskFile, pEpFile->msDelay));
                 return;
@@ -344 +355 @@
             pdmR3AsyncCompletionCompleteTask(&pTaskFile->Core, pTaskFile->rc, true);
 
-#if PDM_ASYNC_COMPLETION_FILE_WITH_DELAY
+#ifdef PDM_ASYNC_COMPLETION_FILE_WITH_DELAY
             /* Check for an expired delay. */
-            if (   pEpFile->pReqDelayed != NULL
-                && RTTimeProgramMilliTS() >= pEpFile->tsDelayEnd)
+            if (pEpFile->pDelayedHead != NULL)
             {
-                pTaskFile = ASMAtomicXchgPtrT(&pEpFile->pReqDelayed, NULL, PPDMASYNCCOMPLETIONTASKFILE);
-                ASMAtomicXchgU32(&pEpFile->msDelay, 0);
-                LogRel(("AIOMgr: Delayed request %#p completed\n", pTaskFile));
-                pdmR3AsyncCompletionCompleteTask(&pTaskFile->Core, pTaskFile->rc, true);
+                uint64_t tsCur = RTTimeProgramMilliTS();
+                pTaskFile = ASMAtomicXchgPtrT(&pEpFile->pDelayedHead, NULL, PPDMASYNCCOMPLETIONTASKFILE);
+
+                while (pTaskFile)
+                {
+                    PPDMASYNCCOMPLETIONTASKFILE pTmp = pTaskFile;
+                    pTaskFile = pTaskFile->pDelayedNext;
+
+                    if (tsCur >= pTmp->tsDelayEnd)
+                    {
+                        LogRel(("AIOMgr: Delayed request %#p completed\n", pTmp));
+                        pdmR3AsyncCompletionCompleteTask(&pTmp->Core, pTmp->rc, true);
+                    }
+                    else
+                    {
+                        /* Prepend to the delayed list again. */
+                        PPDMASYNCCOMPLETIONTASKFILE pHead = NULL;
+                        do
+                        {
+                            pHead = ASMAtomicReadPtrT(&pEpFile->pDelayedHead, PPDMASYNCCOMPLETIONTASKFILE);
+                            pTmp->pDelayedNext = pHead;
+                        } while (!ASMAtomicCmpXchgPtr(&pEpFile->pDelayedHead, pTmp, pHead));
+                    }
+                }
             }
 #endif
@@ -671 +701 @@
      */
     DBGC_CMDHLP_REQ_VM_RET(pCmdHlp, pCmd, pVM);
-    DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, -1, cArgs == 3);
+    DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, -1, cArgs >= 3);
     DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, 0, pArgs[0].enmType == DBGCVAR_TYPE_STRING);
     DBGC_CMDHLP_ASSERT_PARSER_RET(pCmdHlp, pCmd, 1, pArgs[1].enmType == DBGCVAR_TYPE_STRING);
@@ -679 +709 @@
     pEpClassFile = (PPDMASYNCCOMPLETIONEPCLASSFILE)pVM->pUVM->pdm.s.apAsyncCompletionEndpointClass[PDMASYNCCOMPLETIONEPCLASSTYPE_FILE];
 
-    /* Syntax is "read|write <filename> <status code>" */
-    bool fWrite;
+    /* Syntax is "read|write|flush|any <filename> <delay> [reqs]" */
+    PDMACFILEREQTYPEDELAY enmDelayType = PDMACFILEREQTYPEDELAY_ANY;
     if (!RTStrCmp(pArgs[0].u.pszString, "read"))
-        fWrite = false;
+        enmDelayType = PDMACFILEREQTYPEDELAY_READ;
     else if (!RTStrCmp(pArgs[0].u.pszString, "write"))
-        fWrite = true;
+        enmDelayType = PDMACFILEREQTYPEDELAY_WRITE;
+    else if (!RTStrCmp(pArgs[0].u.pszString, "flush"))
+        enmDelayType = PDMACFILEREQTYPEDELAY_FLUSH;
+    else if (!RTStrCmp(pArgs[0].u.pszString, "any"))
+        enmDelayType = PDMACFILEREQTYPEDELAY_ANY;
     else
         return DBGCCmdHlpFail(pCmdHlp, pCmd, "invalid transfer direction '%s'", pArgs[0].u.pszString);
@@ -692 +726 @@
         return DBGCCmdHlpFail(pCmdHlp, pCmd, "The delay '%lld' is out of range", pArgs[0].u.u64Number);
 
+    uint32_t cReqsDelay = 1;
+    if (cArgs == 4)
+        cReqsDelay = (uint32_t)pArgs[3].u.u64Number;
 
     /*
@@ -708 +745 @@
     if (pEpFile)
     {
-        bool fXchg = ASMAtomicCmpXchgU32(&pEpFile->msDelay, msDelay, 0);
-
-        if (fXchg)
-            DBGCCmdHlpPrintf(pCmdHlp, "Injected delay of %u ms into '%s' for %s\n",
-                             msDelay, pArgs[1].u.pszString, pArgs[0].u.pszString);
-        else
-            DBGCCmdHlpPrintf(pCmdHlp, "Another delay for '%s' is still active, ignoring\n",
-                             pArgs[1].u.pszString);
+        ASMAtomicWriteSize(&pEpFile->enmTypeDelay, enmDelayType);
+        ASMAtomicWriteU32(&pEpFile->msDelay, msDelay);
+        ASMAtomicWriteU32(&pEpFile->cReqsDelay, cReqsDelay);
+
+        DBGCCmdHlpPrintf(pCmdHlp, "Injected delay for the next %u requests of %u ms into '%s' for %s\n",
+                         cReqsDelay, msDelay, pArgs[1].u.pszString, pArgs[0].u.pszString);
     }
 

trunk/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h

@@ -311 +311 @@
 } PDMASYNCCOMPLETIONENDPOINTFILESTATE;
 
+typedef enum PDMACFILEREQTYPEDELAY
+{
+    PDMACFILEREQTYPEDELAY_ANY = 0,
+    PDMACFILEREQTYPEDELAY_READ,
+    PDMACFILEREQTYPEDELAY_WRITE,
+    PDMACFILEREQTYPEDELAY_FLUSH,
+    PDMACFILEREQTYPEDELAY_32BIT_HACK = 0x7fffffff
+} PDMACFILEREQTYPEDELAY;
+
 /**
  * Data for the file endpoint.
@@ -371 +380 @@
     /** Request delay. */
     volatile uint32_t                      msDelay;
+    /** Number of requests to delay. */
+    volatile uint32_t                      cReqsDelay;
+    /** Task type to delay. */
+    PDMACFILEREQTYPEDELAY                  enmTypeDelay;
     /** The current task which gets delayed. */
-    PPDMASYNCCOMPLETIONTASKFILE            pReqDelayed;
-    /** Timestamp when the delay expires. */
-    uint64_t                               tsDelayEnd;
+    PPDMASYNCCOMPLETIONTASKFILE            pDelayedHead;
 #endif
     /** Flag whether a blocking event is pending and needs
@@ -498 +509 @@
     /** Return code. */
     volatile int          rc;
+#ifdef PDM_ASYNC_COMPLETION_FILE_WITH_DELAY
+    volatile PPDMASYNCCOMPLETIONTASKFILE pDelayedNext;
+    /** Timestamp when the delay expires. */
+    uint64_t                             tsDelayEnd;
+#endif
 } PDMASYNCCOMPLETIONTASKFILE;