Changeset 90851 in vbox

Timestamp:

Aug 24, 2021 3:50:26 PM (3 years ago)

Author:

vboxsync

Message:

Audio/VKAT: Fail-safe for not trying too hard playing back stuff; logging. ​bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

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

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

@@ -575 +575 @@
             }
 
+            RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Ending test set on guest ...\n");
             int rc2 = AudioTestSvcClientTestSetEnd(&pTstEnv->u.Host.AtsClGuest, pTstEnv->szTag);
             if (RT_FAILURE(rc2))
@@ -583 +584 @@
             }
 
+            RTTestPrintf(g_hTest, RTTESTLVL_DEBUG, "Ending test set on host (Validation Kit audio driver) ...\n");
             rc2 = AudioTestSvcClientTestSetEnd(&pTstEnv->u.Host.AtsClValKit, pTstEnv->szTag);
             if (RT_FAILURE(rc2))

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

@@ -300 +300 @@
 
         uint64_t        offStream          = 0;
+        uint64_t        tsStartMs          = RTTimeMilliTS();
+        RTMSINTERVAL    uTimeoutMs         = pParms->msDuration * 4; /* Four times the time playback should roughly take */
 
         while (cbToPlayTotal)
@@ -348 +350 @@
             Assert(cbToPlayTotal >= cbPlayed);
             cbToPlayTotal -= cbPlayed;
+
+            /* Fail-safe in case something screwed up while playing back. */
+            if (RTTimeMilliTS() - tsStartMs > uTimeoutMs)
+            {
+                RTTestFailed(g_hTest, "Playback took too long (%RU32ms exceeded), aborting\n", uTimeoutMs);
+                rc = VERR_TIMEOUT;
+                break;
+            }
         }
-
-        if (RT_SUCCESS(rc))
-            rc = AudioTestMixStreamDrain(&pStream->Mix, true /*fSync*/);
 
         if (cbToPlayTotal != 0)
             RTTestFailed(g_hTest, "Playback ended unexpectedly (%RU32 bytes left)\n", cbToPlayTotal);
+
+        if (RT_SUCCESS(rc))
+        {
+            RTTestPrintf(g_hTest, RTTESTLVL_ALWAYS, "Draining stream ...\n");
+            rc = AudioTestMixStreamDrain(&pStream->Mix, true /*fSync*/);
+        }
     }
     else