Changeset 89091 in vbox for trunk/src/VBox/ValidationKit/utils/audio

Timestamp:

May 17, 2021 11:11:09 AM (4 years ago)

Author:

vboxsync

Message:

ValKit/Audio: Added switches for enabling and controlling the DrvAudio debug output. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (12 diffs)

trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp

@@ -71 +71 @@
 *********************************************************************************************************************************/
 /** For use in the option switch to handle common options. */
-#define AUDIO_TEST_COMMON_OPTION_CASES() \
+#define AUDIO_TEST_COMMON_OPTION_CASES(a_ValueUnion) \
             case 'q': \
                 g_uVerbosity = 0; \
@@ -84 +84 @@
             \
             case 'h': \
-                return audioTestUsage(g_pStdOut)
-
+                return audioTestUsage(g_pStdOut); \
+            \
+            case AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_ENABLE: \
+                g_fDrvAudioDebug = true; \
+                break; \
+            \
+            case AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_PATH: \
+                g_pszDrvAudioDebug = (a_ValueUnion).psz; \
+                break
 
 
@@ -219 +226 @@
 *********************************************************************************************************************************/
 /**
- * Enumeration of test ("test") command line parameters.
+ * Common long options values.
+ */
+enum
+{
+    AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_ENABLE = 256,
+    AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_PATH
+};
+
+/**
+ * Long option values for the 'test' command.
  */
 enum
@@ -237 +253 @@
 
 /**
- * Enumeration of verification ("verify") command line parameters.
+ * Long option values for the 'verify' command.
  */
 enum
@@ -249 +265 @@
 static const RTGETOPTDEF g_aCmdCommonOptions[] =
 {
-    { "--quiet",            'q',                          RTGETOPT_REQ_NOTHING },
-    { "--verbose",          'v',                          RTGETOPT_REQ_NOTHING },
+    { "--quiet",            'q',                                        RTGETOPT_REQ_NOTHING },
+    { "--verbose",          'v',                                        RTGETOPT_REQ_NOTHING },
+    { "--debug-audio",      AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_ENABLE,      RTGETOPT_REQ_NOTHING },
+    { "--debug-audio-path", AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_PATH,        RTGETOPT_REQ_STRING  },
 };
 
@@ -327 +345 @@
 /** The current verbosity level. */
 static unsigned     g_uVerbosity = 0;
+/** DrvAudio: Enable debug (or not). */
+static bool         g_fDrvAudioDebug = 0;
+/** DrvAudio: The debug output path. */
+static const char  *g_pszDrvAudioDebug = NULL;
 
 
@@ -382 +404 @@
 VMMR3DECL(int) CFGMR3QueryStringDef(PCFGMNODE pNode, const char *pszName, char *pszString, size_t cchString, const char *pszDef)
 {
+    PCPDMDRVREG pDrvReg = (PCPDMDRVREG)pNode;
+    if (RT_VALID_PTR(pDrvReg))
+    {
+        const char *pszRet = pszDef;
+        if (   strcmp(pDrvReg->szName, "AUDIO") == 0
+            && strcmp(pszName, "DebugPathOut") == 0)
+            pszRet = g_pszDrvAudioDebug;
+
+        int rc = RTStrCopy(pszString, cchString, pszRet);
+
+        if (g_uVerbosity > 2)
+            RTPrintf("debug: CFGMR3QueryStringDef([%s], %s, %p, %#x, %s) -> '%s' + %Rrc\n",
+                     pDrvReg->szName, pszName, pszString, cchString, pszDef, pszRet, rc);
+        return rc;
+    }
+
     if (g_uVerbosity > 2)
         RTPrintf("debug: CFGMR3QueryStringDef(%p, %s, %p, %#x, %s)\n", pNode, pszName, pszString, cchString, pszDef);
@@ -389 +427 @@
 VMMR3DECL(int) CFGMR3QueryBoolDef(PCFGMNODE pNode, const char *pszName, bool *pf, bool fDef)
 {
-    RT_NOREF(pNode, pszName, pf);
-    return fDef;
+    PCPDMDRVREG pDrvReg = (PCPDMDRVREG)pNode;
+    if (RT_VALID_PTR(pDrvReg))
+    {
+        *pf = fDef;
+        if (   strcmp(pDrvReg->szName, "AUDIO") == 0
+            && strcmp(pszName, "DebugEnabled") == 0)
+            *pf = g_fDrvAudioDebug;
+
+        if (g_uVerbosity > 2)
+            RTPrintf("debug: CFGMR3QueryBoolDef([%s], %s, %p, %RTbool) -> %RTbool\n", pDrvReg->szName, pszName, pf, fDef, *pf);
+        return VINF_SUCCESS;
+    }
+    *pf = fDef;
+    return VINF_SUCCESS;
 }
 
@@ -1792 +1842 @@
                 break;
 
-            AUDIO_TEST_COMMON_OPTION_CASES();
+            AUDIO_TEST_COMMON_OPTION_CASES(ValueUnion);
 
             default:
@@ -1929 +1979 @@
                 break;
 
-            AUDIO_TEST_COMMON_OPTION_CASES();
+            AUDIO_TEST_COMMON_OPTION_CASES(ValueUnion);
 
             default:
@@ -2163 +2213 @@
             }
 
-            AUDIO_TEST_COMMON_OPTION_CASES();
+            AUDIO_TEST_COMMON_OPTION_CASES(ValueUnion);
 
             default:
@@ -2220 +2270 @@
                  "\n"
                  "Global Options:\n"
+                 "  --debug-audio\n"
+                 "    Enables DrvAudio debugging.\n"
+                 "  --debug-audio-path=<path>\n"
+                 "    Tells DrvAudio where to put its debug output (wav-files).\n"
                  "  -q, --quiet\n"
                  "    Sets verbosity to zero.\n"