Changeset 90830 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Aug 24, 2021 10:47:52 AM (3 years ago)

Author:

vboxsync

Message:

Audio/ValKit: More work on ATS client destruction handling. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (2 diffs)
• vkatCmdSelfTest.cpp (modified) (2 diffs)
• vkatCommon.cpp (modified) (4 diffs)

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

@@ -257 +257 @@
     pTstParmsAcq->enmDir      = PDMAUDIODIR_OUT;
 #ifdef DEBUG
-    pTstParmsAcq->cIterations = 4;
+    pTstParmsAcq->cIterations = 1;
 #else
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);
@@ -361 +361 @@
     pTstParmsAcq->enmDir      = PDMAUDIODIR_IN;
 #ifdef DEBUG
-    pTstParmsAcq->cIterations = 4;
+    pTstParmsAcq->cIterations = 1;
 #else
     pTstParmsAcq->cIterations = RTRandU32Ex(1, 10);

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

@@ -162 +162 @@
     /* else Step 1a later. */
 
-    RTThreadSleep(5000); /* Fudge: Wait until guest ATS is up. */
+    RTThreadSleep(2000); /* Fudge: Wait until guest ATS is up. 2 seconds should be enough (tm). */
 
     if (RT_SUCCESS(rc))
@@ -192 +192 @@
     RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS,  "Shutting down self test\n");
 
-    ASMAtomicWriteBool(&g_fTerminate, true);
-
+    /* If we started the guest ATS ourselves, wait for it to terminate properly. */
     if (fStartGuestAts)
     {

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

@@ -61 +61 @@
     /** File handle to the (opened) test set archive for reading. */
     RTFILE        hTestSetArchive;
+    /** Number of currently connected clients. */
+    uint8_t       cClients;
 } ATSCALLBACKCTX;
 typedef ATSCALLBACKCTX *PATSCALLBACKCTX;
@@ -463 +465 @@
 *********************************************************************************************************************************/
 
+/** @copydoc ATSCALLBACKS::pfnHowdy
+ *
+ *  @note Runs as part of the guest ATS.
+ */
+static DECLCALLBACK(int) audioTestGstAtsHowdyCallback(void const *pvUser)
+{
+    PATSCALLBACKCTX pCtx = (PATSCALLBACKCTX)pvUser;
+
+    AssertReturn(pCtx->cClients <= UINT8_MAX, VERR_BUFFER_OVERFLOW);
+
+    pCtx->cClients++;
+
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "New client connected, now %RU8 total\n", pCtx->cClients);
+
+    return VINF_SUCCESS;
+}
+
+/** @copydoc ATSCALLBACKS::pfnBye
+ *
+ *  @note Runs as part of the guest ATS.
+ */
+static DECLCALLBACK(int) audioTestGstAtsByeCallback(void const *pvUser)
+{
+    PATSCALLBACKCTX pCtx = (PATSCALLBACKCTX)pvUser;
+
+    AssertReturn(pCtx->cClients, VERR_WRONG_ORDER);
+    pCtx->cClients--;
+
+    RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Clients wants to disconnect, %RU8 remaining\n", pCtx->cClients);
+
+    if (0 == pCtx->cClients) /* All clients disconnected? Tear things down. */
+    {
+        RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Last client disconnected, terminating server ...\n");
+        ASMAtomicWriteBool(&g_fTerminate, true);
+    }
+
+    return VINF_SUCCESS;
+}
+
 /** @copydoc ATSCALLBACKS::pfnTestSetBegin
  *
@@ -870 +911 @@
         ATSCALLBACKS Callbacks;
         RT_ZERO(Callbacks);
+        Callbacks.pfnHowdy            = audioTestGstAtsHowdyCallback;
+        Callbacks.pfnBye              = audioTestGstAtsByeCallback;
         Callbacks.pfnTestSetBegin     = audioTestGstAtsTestSetBeginCallback;
         Callbacks.pfnTestSetEnd       = audioTestGstAtsTestSetEndCallback;
@@ -965 +1008 @@
         return;
 
+    /* When in host mode, we need to destroy our ATS clients in order to also let
+     * the ATS server(s) know we're going to quit. */
+    if (pTstEnv->enmMode == AUDIOTESTMODE_HOST)
+    {
+        AudioTestSvcClientDestroy(&pTstEnv->u.Host.AtsClValKit);
+        AudioTestSvcClientDestroy(&pTstEnv->u.Host.AtsClGuest);
+    }
+
     for (unsigned i = 0; i < RT_ELEMENTS(pTstEnv->aStreams); i++)
     {