Changeset 89839 in vbox for trunk

Timestamp:

Jun 22, 2021 3:36:51 PM (4 years ago)

Author:

vboxsync

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

145296

Message:

Audio/ValKit: More work on logging. bugref:10008

File:

• trunk/src/VBox/Devices/Audio/AudioTest.cpp (modified) (10 diffs)

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

@@ -591 +591 @@
  * @param   idxTest             Index of failing test (zero-based).
  * @param   rc                  Result code of entry to add.
- * @param   pszDesc             Error description format string to add.
- * @param   args                Optional format arguments of \a pszDesc to add.
- */
-static int audioTestErrorDescAddV(PAUDIOTESTERRORDESC pErr, uint32_t idxTest, int rc, const char *pszDesc, va_list args)
+ * @param   pszFormat           Error description format string to add.
+ * @param   va                  Optional format arguments of \a pszDesc to add.
+ */
+static int audioTestErrorDescAddV(PAUDIOTESTERRORDESC pErr, uint32_t idxTest, int rc, const char *pszFormat, va_list va)
 {
     PAUDIOTESTERRORENTRY pEntry = (PAUDIOTESTERRORENTRY)RTMemAlloc(sizeof(AUDIOTESTERRORENTRY));
@@ -600 +600 @@
 
     char *pszDescTmp;
-    if (RTStrAPrintf(&pszDescTmp, pszDesc, args) < 0)
+    if (RTStrAPrintfV(&pszDescTmp, pszFormat, va) < 0)
         AssertFailedReturn(VERR_NO_MEMORY);
 
@@ -622 +622 @@
  * @param   pErr                Test error description to add entry for.
  * @param   idxTest             Index of failing test (zero-based).
- * @param   pszDesc             Error description format string to add.
+ * @param   pszFormat           Error description format string to add.
  * @param   ...                 Optional format arguments of \a pszDesc to add.
  */
-static int audioTestErrorDescAdd(PAUDIOTESTERRORDESC pErr, uint32_t idxTest, const char *pszDesc, ...)
+static int audioTestErrorDescAdd(PAUDIOTESTERRORDESC pErr, uint32_t idxTest, const char *pszFormat, ...)
 {
     va_list va;
-    va_start(va, pszDesc);
-
-    int rc = audioTestErrorDescAddV(pErr, idxTest, VERR_GENERAL_FAILURE /** @todo Fudge! */, pszDesc, va);
+    va_start(va, pszFormat);
+
+    int rc = audioTestErrorDescAddV(pErr, idxTest, VERR_GENERAL_FAILURE /** @todo Fudge! */, pszFormat, va);
 
     va_end(va);
@@ -1637 +1637 @@
 }
 
+#define CHECK_RC_MAYBE_RET(a_rc, a_pVerJob) \
+    if (RT_FAILURE(a_rc)) \
+    { \
+        if (!a_pVerJob->fKeepGoing) \
+            return VINF_SUCCESS; \
+    }
+
+#define CHECK_RC_MSG_MAYBE_RET(a_rc, a_pVerJob, a_Msg) \
+    if (RT_FAILURE(a_rc)) \
+    { \
+        int rc3 = audioTestErrorDescAdd(a_pVerJob->pErr, a_pVerJob->idxTest, (a_Msg)); \
+        AssertRC(rc3); \
+        if (!a_pVerJob->fKeepGoing) \
+            return VINF_SUCCESS; \
+    }
+
 /**
  * Does the actual PCM data verification of a test tone.
  *
  * @returns VBox status code.
- * @param   pVerify             Verification job to verify PCM data for.
+ * @param   pVerJob             Verification job to verify PCM data for.
  * @param   phTest              Test handle of test to verify PCM data for.
  */
-static int audioTestVerifyTestToneData(PAUDIOTESTVERIFYJOB pVerify, PAUDIOTESTOBJHANDLE phTest)
+static int audioTestVerifyTestToneData(PAUDIOTESTVERIFYJOB pVerJob, PAUDIOTESTOBJHANDLE phTest)
 {
     int rc;
@@ -1651 +1667 @@
 
     char szObjA[128];
-    rc = audioTestGetValueStr(pVerify->pSetA, phTest, "obj0_uuid", szObjA, sizeof(szObjA));
-    AssertRCReturn(rc, rc);
+    rc = audioTestGetValueStr(pVerJob->pSetA, phTest, "obj0_uuid", szObjA, sizeof(szObjA));
     PAUDIOTESTOBJ pObjA;
-    rc = audioTestSetObjOpen(pVerify->pSetA, szObjA, &pObjA);
-    AssertRCReturn(rc, rc);
+    rc = audioTestSetObjOpen(pVerJob->pSetA, szObjA, &pObjA);
+    CHECK_RC_MSG_MAYBE_RET(rc, pVerJob, ("Unable to open object A '%s'", szObjA));
 
     char szObjB[128];
-    rc = audioTestGetValueStr(pVerify->pSetB, phTest, "obj0_uuid", szObjB, sizeof(szObjB));
-    AssertRCReturn(rc, rc);
+    rc = audioTestGetValueStr(pVerJob->pSetB, phTest, "obj0_uuid", szObjB, sizeof(szObjB));
     PAUDIOTESTOBJ pObjB;
-    rc = audioTestSetObjOpen(pVerify->pSetB, szObjB, &pObjB);
-    AssertRCReturn(rc, rc);
+    rc = audioTestSetObjOpen(pVerJob->pSetB, szObjB, &pObjB);
+    CHECK_RC_MSG_MAYBE_RET(rc, pVerJob, ("Unable to open object B '%s'", szObjB));
 
     AssertReturn(pObjA->enmType == AUDIOTESTOBJTYPE_FILE, VERR_NOT_SUPPORTED);
@@ -1680 +1694 @@
         /** @todo Add more sophisticated stuff here. */
 
-        int rc2 = audioTestErrorDescAdd(pVerify->pErr, pVerify->idxTest, "Files '%s' and '%s' don't match\n", szObjA, szObjB);
+        int rc2 = audioTestErrorDescAdd(pVerJob->pErr, pVerJob->idxTest, "Files '%s' and '%s' don't match\n", szObjA, szObjB);
         AssertRC(rc2);
     }
@@ -1775 +1789 @@
     VerJob.fKeepGoing = true;
 
+    PAUDIOTESTVERIFYJOB pVerJob = &VerJob;
+
     int rc;
 
@@ -1784 +1800 @@
 
     rc = audioTestVerifyValue(&VerJob, &hHdr,   "magic",        "vkat_ini",    "Manifest magic wrong");
-    AssertRCReturn(rc, rc);
+    CHECK_RC_MAYBE_RET(rc, pVerJob);
     rc = audioTestVerifyValue(&VerJob, &hHdr,   "ver",          "1"       ,    "Manifest version wrong");
-    AssertRCReturn(rc, rc);
+    CHECK_RC_MAYBE_RET(rc, pVerJob);
     rc = audioTestVerifyValue(&VerJob, &hHdr,   "tag",          NULL,          "Manifest tags don't match");
-    AssertRCReturn(rc, rc);
+    CHECK_RC_MAYBE_RET(rc, pVerJob);
     rc = audioTestVerifyValue(&VerJob, &hHdr,   "test_count",   NULL,          "Test counts don't match");
-    AssertRCReturn(rc, rc);
+    CHECK_RC_MAYBE_RET(rc, pVerJob);
     rc = audioTestVerifyValue(&VerJob, &hHdr,   "obj_count",    NULL,          "Object counts don't match");
-    AssertRCReturn(rc, rc);
-
-    if (   pErrDesc->cErrors
-        && !VerJob.fKeepGoing)
-        return VINF_SUCCESS;
+    CHECK_RC_MAYBE_RET(rc, pVerJob);
 
     /*
@@ -1814 +1826 @@
         AUDIOTESTTYPE enmTestTypeA;
         rc = audioTestGetValueUInt32(VerJob.pSetA, &hTest, "test_type", (uint32_t *)&enmTestTypeA);
-        AssertRCReturn(rc, rc);
+        CHECK_RC_MSG_MAYBE_RET(rc, pVerJob, ("Test type A not found"));
+
         AUDIOTESTTYPE enmTestTypeB;
         rc = audioTestGetValueUInt32(VerJob.pSetB, &hTest, "test_type", (uint32_t *)&enmTestTypeB);
-        AssertRCReturn(rc, rc);
+        CHECK_RC_MSG_MAYBE_RET(rc, pVerJob, ("Test type B not found"));
 
         switch (enmTestTypeA)
@@ -1857 +1870 @@
     }
 
-#undef VERIFY_VALUE
-
     /* Only return critical stuff not related to actual testing here. */
     return VINF_SUCCESS;
 }
+
+#undef CHECK_RC_MAYBE_RET
+#undef CHECK_RC_MSG_MAYBE_RET