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

Timestamp:

May 27, 2021 12:31:34 PM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Implemented handling for meta data of test (set) objects. bugref:10008

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioTest.cpp (modified) (11 diffs)
• AudioTest.h (modified) (4 diffs)

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

@@ -452 +452 @@
 
     RTListInit(&pSet->lstTest);
-    pSet->cTests        = 0;
-    pSet->cTestsRunning = 0;
-    pSet->offTestCount  = 0;
-
+    pSet->cTests         = 0;
+    pSet->cTestsRunning  = 0;
+    pSet->offTestCount   = 0;
+    pSet->pTestCur       = NULL;
+    pSet->cObj           = 0;
+    pSet->offObjCount    = 0;
     pSet->cTotalFailures = 0;
 }
@@ -705 +707 @@
     AssertRCReturn(rc, rc);
 
+    rc = audioTestManifestWrite(pSet, "obj_count=");
+    AssertRCReturn(rc, rc);
+    pSet->offObjCount = audioTestManifestGetOffsetAbs(pSet);
+    rc = audioTestManifestWrite(pSet, "0000\n"); /* A bit messy, but does the trick for now. */
+    AssertRCReturn(rc, rc);
+
     pSet->enmMode = AUDIOTESTSETMODE_TEST;
 
@@ -809 +817 @@
         return VINF_SUCCESS;
 
-    /* Update number of ran tests. */
-    int rc = RTFileSeek(pSet->f.hFile, pSet->offTestCount, RTFILE_SEEK_BEGIN, NULL);
+    int rc;
+
+    /* Update number of bound test objects. */
+    PAUDIOTESTENTRY pTest;
+    RTListForEach(&pSet->lstTest, pTest, AUDIOTESTENTRY, Node)
+    {
+        rc = RTFileSeek(pSet->f.hFile, pTest->offObjCount, RTFILE_SEEK_BEGIN, NULL);
+        AssertRCReturn(rc, rc);
+        rc = audioTestManifestWrite(pSet, "%04RU32", pTest->cObj);
+        AssertRCReturn(rc, rc);
+    }
+
+    /*
+     * Update number of ran tests.
+     */
+    rc = RTFileSeek(pSet->f.hFile, pSet->offObjCount, RTFILE_SEEK_BEGIN, NULL);
+    AssertRCReturn(rc, rc);
+    rc = audioTestManifestWrite(pSet, "%04RU32", pSet->cObj);
+    AssertRCReturn(rc, rc);
+
+    /*
+     * Update number of ran tests.
+     */
+    rc = RTFileSeek(pSet->f.hFile, pSet->offTestCount, RTFILE_SEEK_BEGIN, NULL);
     AssertRCReturn(rc, rc);
     rc = audioTestManifestWrite(pSet, "%04RU32", pSet->cTests);
     AssertRCReturn(rc, rc);
+
+    /*
+     * Serialize all registered test objects.
+     */
+    rc = RTFileSeek(pSet->f.hFile, 0, RTFILE_SEEK_END, NULL);
+    AssertRCReturn(rc, rc);
+
+    PAUDIOTESTOBJ pObj;
+    RTListForEach(&pSet->lstObj, pObj, AUDIOTESTOBJ, Node)
+    {
+        rc = audioTestManifestWrite(pSet, "\n");
+        AssertRCReturn(rc, rc);
+        char szUuid[64];
+        rc = RTUuidToStr(&pObj->Uuid, szUuid, sizeof(szUuid));
+        AssertRCReturn(rc, rc);
+        rc = audioTestManifestWriteSectionHdr(pSet, "obj_%s", szUuid);
+        AssertRCReturn(rc, rc);
+        rc = audioTestManifestWrite(pSet, "obj_type=%RU32\n", pObj->enmType);
+        AssertRCReturn(rc, rc);
+        rc = audioTestManifestWrite(pSet, "obj_name=%s\n", pObj->szName);
+        AssertRCReturn(rc, rc);
+    }
 
     RTFileClose(pSet->f.hFile);
@@ -865 +917 @@
 
 /**
- * Creates and registers a new audio test object to a test set.
+ * Creates and registers a new audio test object to the current running test.
  *
  * @returns VBox status code.
@@ -874 +926 @@
 int AudioTestSetObjCreateAndRegister(PAUDIOTESTSET pSet, const char *pszName, PAUDIOTESTOBJ *ppObj)
 {
+    AssertReturn(pSet->cTestsRunning == 1, VERR_WRONG_ORDER); /* No test nesting allowed. */
+
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
 
@@ -892 +946 @@
         {
             pObj->enmType = AUDIOTESTOBJTYPE_FILE;
+            pObj->cRefs   = 1; /* Currently only 1:1 mapping. */
 
             RTListAppend(&pSet->lstObj, &pObj->Node);
             pSet->cObj++;
+
+            /* Generate + set an UUID for the object and assign it to the current test. */
+            rc = RTUuidCreate(&pObj->Uuid);
+            AssertRCReturn(rc, rc);
+            char szUuid[64];
+            rc = RTUuidToStr(&pObj->Uuid, szUuid, sizeof(szUuid));
+            AssertRCReturn(rc, rc);
+
+            rc = audioTestManifestWrite(pSet, "obj%RU32_uuid=%s\n", pSet->pTestCur->cObj, szUuid);
+            AssertRCReturn(rc, rc);
+
+            AssertPtr(pSet->pTestCur);
+            pSet->pTestCur->cObj++;
 
             *ppObj = pObj;
@@ -963 +1031 @@
     AssertRCReturn(rc, rc);
 
-    rc = audioTestManifestWriteSectionHdr(pSet, "test%04RU32", pSet->cTests);
+    rc = audioTestManifestWriteSectionHdr(pSet, "test_%04RU32", pSet->cTests);
     AssertRCReturn(rc, rc);
     rc = audioTestManifestWrite(pSet, "test_desc=%s\n", pszDesc);
@@ -972 +1040 @@
     AssertRCReturn(rc, rc);
     rc = audioTestManifestWrite(pSet, "audio_direction=%s\n", PDMAudioDirGetName(pParms->enmDir));
+    AssertRCReturn(rc, rc);
+
+    rc = audioTestManifestWrite(pSet, "obj_count=");
+    AssertRCReturn(rc, rc);
+    pEntry->offObjCount = audioTestManifestGetOffsetAbs(pSet);
+    rc = audioTestManifestWrite(pSet, "0000\n"); /* A bit messy, but does the trick for now. */
     AssertRCReturn(rc, rc);
 
@@ -1009 +1083 @@
     pSet->cTests++;
     pSet->cTestsRunning++;
+    pSet->pTestCur = pEntry;
 
     *ppEntry = pEntry;
@@ -1028 +1103 @@
 
     pEntry->pParent->cTestsRunning--;
+    pEntry->pParent->pTestCur = NULL;
 
     return rc2;
@@ -1041 +1117 @@
 
     pEntry->pParent->cTestsRunning--;
+    pEntry->pParent->pTestCur = NULL;
 
     return rc2;

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

@@ -185 +185 @@
     /** List node. */
     RTLISTNODE           Node;
+    RTUUID               Uuid;
+    /** Number of references to this test object. */
+    uint32_t             cRefs;
     /** Name of the test object.
      *  Must not contain a path and has to be able to serialize to disk. */
@@ -208 +211 @@
     char                 szDesc[64];
     AUDIOTESTPARMS       Parms;
+    /** Number of test objects bound to this test. */
+    uint32_t             cObj;
+    /** Absolute offset (in bytes) where to write the "obj_count" value later. */
+    uint64_t             offObjCount;
     int                  rc;
 } AUDIOTESTENTRY;
@@ -234 +241 @@
     /** Number of test objects in lstObj. */
     uint32_t         cObj;
+    /** Absolute offset (in bytes) where to write the "obj_count" value later. */
+    uint64_t         offObjCount;
     /** List containing PAUDIOTESTOBJ test object entries. */
     RTLISTANCHOR     lstObj;
@@ -243 +252 @@
     /** List containing PAUDIOTESTENTRY test entries. */
     RTLISTANCHOR     lstTest;
-    /** Number of tests currently running. */
+    /** Current test running. Can be NULL if no test is running. */
+    PAUDIOTESTENTRY  pTestCur;
+    /** Number of tests currently running.
+     *  Currently we only allow one concurrent test running at a given time. */
     uint32_t         cTestsRunning;
     /** Number of total (test) failures. */