Changeset 89835 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jun 22, 2021 1:57:01 PM (4 years ago)

Author:

vboxsync

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

145292

Message:

Audio/ValKit: Factored out cleaning up the registered tests in the ValKit audio driver and also do so when ending a test set. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DrvHostAudioValidationKit.cpp

@@ -211 +211 @@
 }
 
-/** @copydoc ATSCALLBACKS::pfnTestSetBegin */
-static DECLCALLBACK(int) drvHostValKitTestSetBegin(void const *pvUser, const char *pszTag)
-{
-    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
-
-    LogRel(("Audio: Validation Kit: Beginning test set '%s'\n", pszTag));
-    return AudioTestSetCreate(&pThis->Set, pThis->szPathTemp, pszTag);
+/**
+ * Performs some internal cleanup / housekeeping of all registered tests.
+ *
+ * @param   pThis               ValKit audio driver instance.
+ */
+static void drvHostValKitCleanup(PDRVHOSTVALKITAUDIO pThis)
+{
+    LogRel(("Audio: Validation Kit: Cleaning up ...\n"));
+
+    if (pThis->cTestsRec)
+        LogRel(("Audio: Validation Kit: Warning: %RU32 guest recording tests still outstanding:\n", pThis->cTestsRec));
+
+    PVALKITTESTDATA pTst, pTstNext;
+    RTListForEachSafe(&pThis->lstTestsRec, pTst, pTstNext, VALKITTESTDATA, Node)
+    {
+        size_t const cbOutstanding = pTst->t.TestTone.u.Rec.cbToWrite - pTst->t.TestTone.u.Rec.cbWritten;
+        if (cbOutstanding)
+            LogRel(("Audio: Validation Kit: \tRecording test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
+                    pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, cbOutstanding)));
+        drvHostValKiUnregisterRecTest(pThis, pTst);
+    }
+
+    if (pThis->cTestsPlay)
+        LogRel(("Audio: Validation Kit: Warning: %RU32 guest playback tests still outstanding:\n", pThis->cTestsPlay));
+
+    RTListForEachSafe(&pThis->lstTestsPlay, pTst, pTstNext, VALKITTESTDATA, Node)
+    {
+        size_t const cbOutstanding = pTst->t.TestTone.u.Play.cbToRead - pTst->t.TestTone.u.Play.cbRead;
+        if (cbOutstanding)
+            LogRel(("Audio: Validation Kit: \tPlayback test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
+                    pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, cbOutstanding)));
+        drvHostValKiUnregisterPlayTest(pThis, pTst);
+    }
+
+    Assert(pThis->cTestsRec == 0);
+    Assert(pThis->cTestsPlay == 0);
 }
 
@@ -225 +254 @@
 *********************************************************************************************************************************/
 
+/** @copydoc ATSCALLBACKS::pfnTestSetBegin */
+static DECLCALLBACK(int) drvHostValKitTestSetBegin(void const *pvUser, const char *pszTag)
+{
+    PDRVHOSTVALKITAUDIO pThis = (PDRVHOSTVALKITAUDIO)pvUser;
+
+    LogRel(("Audio: Validation Kit: Beginning test set '%s'\n", pszTag));
+    return AudioTestSetCreate(&pThis->Set, pThis->szPathTemp, pszTag);
+}
+
 /** @copydoc ATSCALLBACKS::pfnTestSetEnd */
 static DECLCALLBACK(int) drvHostValKitTestSetEnd(void const *pvUser, const char *pszTag)
@@ -242 +280 @@
     if (RT_SUCCESS(rc))
         LogRel(("Audio: Validation Kit: Packed up to '%s'\n", pThis->szTestSetArchive));
+
+    /* Do some internal housekeeping. */
+    drvHostValKitCleanup(pThis);
 
     int rc2 = AudioTestSetWipe(pSet);
@@ -869 +910 @@
     if (RT_SUCCESS(rc))
     {
-        LogRel(("Audio: Validation Kit: Shutdown of Audio Test Service complete\n"));
-
-        if (pThis->cTestsRec)
-            LogRel(("Audio: Validation Kit: Warning: %RU32 guest recording tests still outstanding:\n", pThis->cTestsRec));
-
-        PVALKITTESTDATA pTst, pTstNext;
-        RTListForEachSafe(&pThis->lstTestsRec, pTst, pTstNext, VALKITTESTDATA, Node)
-        {
-            size_t const cbOutstanding = pTst->t.TestTone.u.Rec.cbToWrite - pTst->t.TestTone.u.Rec.cbWritten;
-            if (cbOutstanding)
-                LogRel(("Audio: Validation Kit: \tRecording test #%RU32 has %RU64 bytes outstanding\n", pTst->idxTest, cbOutstanding));
-            drvHostValKiUnregisterRecTest(pThis, pTst);
-        }
-
-        if (pThis->cTestsPlay)
-            LogRel(("Audio: Validation Kit: Warning: %RU32 guest playback tests still outstanding:\n", pThis->cTestsPlay));
-
-        RTListForEachSafe(&pThis->lstTestsPlay, pTst, pTstNext, VALKITTESTDATA, Node)
-        {
-            size_t const cbOutstanding = pTst->t.TestTone.u.Play.cbToRead - pTst->t.TestTone.u.Play.cbRead;
-            if (cbOutstanding)
-                LogRel(("Audio: Validation Kit: \tPlayback test #%RU32 has %RU64 bytes outstanding\n", pTst->idxTest, cbOutstanding));
-            drvHostValKiUnregisterPlayTest(pThis, pTst);
-        }
-
-        Assert(pThis->cTestsRec == 0);
-        Assert(pThis->cTestsPlay == 0);
+        LogRel(("Audio: Validation Kit: Shutdown of Audio Test Service (ATS) complete\n"));
+        drvHostValKitCleanup(pThis);
     }
     else
-        LogRel(("Audio: Validation Kit: Shutdown of Audio Test Service failed, rc=%Rrc\n", rc));
+        LogRel(("Audio: Validation Kit: Shutdown of Audio Test Service (ATS) failed, rc=%Rrc\n", rc));
 
     /* Try cleaning up a bit. */