Changeset 91051 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 1, 2021 9:08:56 AM (3 years ago)

Author:

vboxsync

Message:

Audio/Validation Kit: More diagnostics / help for the Validation Kit audio driver. ​bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTest.cpp (modified) (4 diffs)
• AudioTest.h (modified) (1 diff)
• DrvHostAudioValidationKit.cpp (modified) (9 diffs)

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

@@ -921 +921 @@
 
 /**
+ * Returns the total number of registered tests.
+ *
+ * @returns Total number of registered tests.
+ * @param   pSet                Test set to return value for.
+ */
+uint32_t AudioTestSetGetTestsTotal(PAUDIOTESTSET pSet)
+{
+    return pSet->cTests;
+}
+
+/**
+ * Returns the total number of (still) running tests.
+ *
+ * @returns Total number of (still) running tests.
+ * @param   pSet                Test set to return value for.
+ */
+uint32_t AudioTestSetGetTestsRunning(PAUDIOTESTSET pSet)
+{
+    return pSet->cTestsRunning;
+}
+
+/**
+ * Returns the total number of test failures occurred.
+ *
+ * @returns Total number of test failures occurred.
+ * @param   pSet                Test set to return value for.
+ */
+uint32_t AudioTestSetGetTotalFailures(PAUDIOTESTSET pSet)
+{
+    return pSet->cTotalFailures;
+}
+
+/**
  * Creates a new audio test set.
  *
@@ -1216 +1249 @@
         }
 
-        RTFileClose(pSet->f.hFile);
-        pSet->f.hFile = NIL_RTFILE;
+        rc = RTFileClose(pSet->f.hFile);
+        if (RT_SUCCESS(rc))
+            pSet->f.hFile = NIL_RTFILE;
     }
     else if (pSet->enmMode == AUDIOTESTSETMODE_VERIFY)
@@ -1226 +1260 @@
         rc = VINF_SUCCESS;
     }
-    else /* Not supported, just skip. */
-        rc = VINF_SUCCESS;
+    else
+        AssertFailedStmt(rc = VERR_NOT_SUPPORTED);
 
     return rc;
@@ -1577 +1611 @@
     AssertReturn(!audioTestManifestIsOpen(pSet), VERR_WRONG_ORDER);
 
-    AssertMsgReturn(pSet->cTests, ("No tests run yet"), VERR_WRONG_ORDER);
-    AssertMsgReturn(pSet->cTestsRunning == 0 , ("Some tests are still running"), VERR_WRONG_ORDER);
+    AssertMsgReturn(pSet->cTests, ("No tests run yet"), VERR_INVALID_STATE);
+    AssertMsgReturn(pSet->cTestsRunning == 0 , ("Some tests are still running"), VERR_INVALID_STATE);
 
     /** @todo Check and deny if \a pszOutDir is part of the set's path. */

trunk/src/VBox/Devices/Audio/AudioTest.h

@@ -288 +288 @@
 int    AudioTestSetWipe(PAUDIOTESTSET pSet);
 const char *AudioTestSetGetTag(PAUDIOTESTSET pSet);
+uint32_t AudioTestSetGetTestsTotal(PAUDIOTESTSET pSet);
+uint32_t AudioTestSetGetTestsRunning(PAUDIOTESTSET pSet);
+uint32_t AudioTestSetGetTotalFailures(PAUDIOTESTSET pSet);
 bool   AudioTestSetIsPacked(const char *pszPath);
 bool   AudioTestSetIsRunning(PAUDIOTESTSET pSet);

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

@@ -121 +121 @@
     /** Pointer to host audio interface. */
     PDMIHOSTAUDIO       IHostAudio;
+    /** Total number of bytes played since driver construction. */
+    uint64_t            cbPlayedTotal;
+    /** Total number of bytes recorded since driver construction. */
+    uint64_t            cbRecordedTotal;
     /** Temporary path to use. */
     char                szPathTemp[RTPATH_MAX];
@@ -236 +240 @@
         LogRel(("ValKit: Warning: %RU32 guest recording tests still outstanding:\n", pThis->cTestsRec));
 
+    if (   pThis->cTestsTotal
+        && (   !pThis->cbPlayedTotal
+            && !pThis->cbRecordedTotal)
+       )
+    {
+        LogRel(("ValKit: Warning: Did not get any audio data to play or record altough tests were configured -- audio stack misconfiguration / bug?\n"));
+    }
+
     PVALKITTESTDATA pTst, pTstNext;
     RTListForEachSafe(&pThis->lstTestsRec, pTst, pTstNext, VALKITTESTDATA, Node)
@@ -241 +253 @@
         size_t const cbOutstanding = pTst->t.TestTone.u.Rec.cbToWrite - pTst->t.TestTone.u.Rec.cbWritten;
         if (cbOutstanding)
-            LogRel(("ValKit: \tRecording test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
-                    pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, (uint32_t)cbOutstanding)));
+            LogRel(("ValKit: \tRecording test #%RU32 has %RU64 bytes (%RU32ms) outstanding (%RU8%% left)\n",
+                    pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, (uint32_t)cbOutstanding),
+                    (pTst->t.TestTone.u.Rec.cbWritten * 100) / RT_MAX(pTst->t.TestTone.u.Rec.cbToWrite, 1)));
         drvHostValKiUnregisterRecTest(pThis, pTst);
     }
@@ -253 +266 @@
         size_t const cbOutstanding = pTst->t.TestTone.u.Play.cbToRead - pTst->t.TestTone.u.Play.cbRead;
         if (cbOutstanding)
-            LogRel(("ValKit: \tPlayback test #%RU32 has %RU64 bytes (%RU32ms) outstanding\n",
-                    pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, (uint32_t)cbOutstanding)));
+            LogRel(("ValKit: \tPlayback test #%RU32 has %RU64 bytes (%RU32ms) outstanding (%RU8%% left)\n",
+                    pTst->idxTest, cbOutstanding, PDMAudioPropsBytesToMilli(&pTst->t.TestTone.Parms.Props, (uint32_t)cbOutstanding),
+                    (pTst->t.TestTone.u.Play.cbRead * 100) / RT_MAX(pTst->t.TestTone.u.Play.cbToRead, 1)));
         drvHostValKiUnregisterPlayTest(pThis, pTst);
     }
@@ -319 +333 @@
             }
         }
+
+        LogRel(("ValKit: Test set has %RU32 tests total, %RU32 (still) running, %RU32 failures total\n",
+                AudioTestSetGetTestsTotal(pSet), AudioTestSetGetTestsRunning(pSet), AudioTestSetGetTotalFailures(pSet)));
 
         if (RT_SUCCESS(rc))
@@ -797 +814 @@
     PVALKITTESTDATA     pTst  = NULL;
 
+    pThis->cbPlayedTotal += cbBuf; /* Do a bit of accounting. */
+
     bool const fIsSilence = PDMAudioPropsIsBufferSilence(&pStream->pStream->Cfg.Props, pvBuf, cbBuf);
 
@@ -929 +948 @@
     PVALKITAUDIOSTREAM  pStrmValKit = (PVALKITAUDIOSTREAM)pStream;
     PVALKITTESTDATA     pTst        = NULL;
+
+    pThis->cbRecordedTotal += cbBuf; /* Do a bit of accounting. */
 
     int rc = RTCritSectEnter(&pThis->CritSect);
@@ -1091 +1112 @@
     AssertRCReturn(rc, rc);
 
+    pThis->cbPlayedTotal   = 0;
+    pThis->cbRecordedTotal = 0;
+
     pThis->fTestSetEnd = false;
 
@@ -1112 +1136 @@
     const char *pszBindAddr = "127.0.0.1"; /* Only reachable for localhost for now. */
     uint32_t    uBindPort   = ATS_TCP_DEF_BIND_PORT_VALKIT;
+
+    LogRel2(("ValKit: Debug logging enabled\n"));
 
     LogRel(("ValKit: Starting Audio Test Service (ATS) at %s:%RU32...\n",