Changeset 103352 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Feb 14, 2024 1:29:07 PM (13 months ago)

Author:

vboxsync

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

161668

Message:

Audio/VKAT: Skip probing the same backend again when an alias for it exists.

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (1 diff)
• vkatCmdGeneric.cpp (modified) (1 diff)
• vkatCmdSelfTest.cpp (modified) (1 diff)
• vkatDriverStack.cpp (modified) (1 diff)
• vkatInternal.h (modified) (1 diff)

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

@@ -979 +979 @@
     AUDIOTESTDRVSTACK DrvStack;
     if (fProbeBackends)
-        rc = audioTestDriverStackProbe(&DrvStack, pDrvReg,
+        rc = audioTestDriverStackProbe(&DrvStack,
                                        true /* fEnabledIn */, true /* fEnabledOut */, TstEnv.IoOpts.fWithDrvAudio); /** @todo Make in/out configurable, too. */
     else

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

@@ -195 +195 @@
     AUDIOTESTDRVSTACK DrvStack;
     if (fProbeBackends)
-        rc = audioTestDriverStackProbe(&DrvStack, pDrvReg,
+        rc = audioTestDriverStackProbe(&DrvStack,
                                        true /* fEnabledIn */, true /* fEnabledOut */, false /* fWithDrvAudio */);
     else

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

@@ -136 +136 @@
 int AudioTestDriverStackPerformSelftest(void)
 {
-    PCPDMDRVREG pDrvReg = AudioTestGetDefaultBackend();
-
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Testing driver stack started\n");
 
     AUDIOTESTDRVSTACK DrvStack;
-    int rc = audioTestDriverStackProbe(&DrvStack, pDrvReg,
+    int rc = audioTestDriverStackProbe(&DrvStack,
                                        true /* fEnabledIn */, true /* fEnabledOut */, false /* fWithDrvAudio */);
     RTTEST_CHECK_RC_OK_RET(g_hTest, rc, rc);

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

@@ -611 +611 @@
  * @returns VBox status code.
  * @param   pDrvStack       The driver stack to initialize.
- * @param   pDrvReg         The backend driver to use.
  * @param   fEnabledIn      Whether input is enabled or not on creation time.
  * @param   fEnabledOut     Whether output is enabled or not on creation time.
  * @param   fWithDrvAudio   Whether to include DrvAudio in the stack or not.
  */
-int audioTestDriverStackProbe(PAUDIOTESTDRVSTACK pDrvStack, PCPDMDRVREG pDrvReg, bool fEnabledIn, bool fEnabledOut, bool fWithDrvAudio)
+int audioTestDriverStackProbe(PAUDIOTESTDRVSTACK pDrvStack, bool fEnabledIn, bool fEnabledOut, bool fWithDrvAudio)
 {
     int rc = VERR_IPE_UNINITIALIZED_STATUS; /* Shut up MSVC. */
 
+    PCPDMDRVREG pDrvLast = NULL; /* Last probed backend. */
+
     for (size_t i = 0; i < g_cBackends; i++)
     {
-        pDrvReg = g_aBackends[i].pDrvReg;
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Probing for backend '%s' ...\n", g_aBackends[i].pszName);
+        PCPDMDRVREG pDrvReg = g_aBackends[i].pDrvReg;
+
+        if (   pDrvLast
+            && pDrvLast == pDrvReg) /* Check if we already probed the backend by another alias and skip if so. */
+            continue;
+
+        pDrvLast = pDrvReg;
+
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Probing for backend '%s' ...\n", pDrvReg->szName);
 
         rc = audioTestDriverStackInitEx(pDrvStack, pDrvReg, fEnabledIn, fEnabledOut, fWithDrvAudio); /** @todo Make in/out configurable, too. */
         if (RT_SUCCESS(rc))
         {
-            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Probing backend '%s' successful\n", g_aBackends[i].pszName);
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Probing backend '%s' successful\n", pDrvReg->szName);
             return rc;
         }
 
-        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Probing backend '%s' failed with %Rrc, trying next one\n",
-                     g_aBackends[i].pszName, rc);
-        continue;
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Probing backend '%s' failed with %Rrc, trying next one\n", pDrvReg->szName, rc);
     }
 

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -412 +412 @@
 int         audioTestDriverStackInitEx(PAUDIOTESTDRVSTACK pDrvStack, PCPDMDRVREG pDrvReg, bool fEnabledIn, bool fEnabledOut, bool fWithDrvAudio);
 int         audioTestDriverStackInit(PAUDIOTESTDRVSTACK pDrvStack, PCPDMDRVREG pDrvReg, bool fWithDrvAudio);
-int         audioTestDriverStackProbe(PAUDIOTESTDRVSTACK pDrvStack, PCPDMDRVREG pDrvReg, bool fEnabledIn, bool fEnabledOut, bool fWithDrvAudio);
+int         audioTestDriverStackProbe(PAUDIOTESTDRVSTACK pDrvStack, bool fEnabledIn, bool fEnabledOut, bool fWithDrvAudio);
 int         audioTestDriverStackSetDevice(PAUDIOTESTDRVSTACK pDrvStack, PDMAUDIODIR enmDir, const char *pszDevId);
 /** @}  */