Changeset 103492 in vbox for trunk/src/VBox/ValidationKit/utils

Timestamp:

Feb 21, 2024 1:45:10 PM (12 months ago)

Author:

vboxsync

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

161834

Message:

Audio/VKAT: Added new test option "--timeout <ms>" to specify the failsafe timeout (defaults to 5 minutes if not specified).

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (4 diffs)
• vkatCommon.cpp (modified) (4 diffs)
• vkatInternal.h (modified) (1 diff)

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

@@ -148 +148 @@
     VKAT_TEST_OPT_PROBE_BACKENDS,
     VKAT_TEST_OPT_TAG,
+    VKAT_TEST_OPT_TIMEOUT,
     VKAT_TEST_OPT_TEMPDIR,
     VKAT_TEST_OPT_VOL,
@@ -210 +211 @@
     { "--tag",               VKAT_TEST_OPT_TAG,                 RTGETOPT_REQ_STRING  },
     { "--tempdir",           VKAT_TEST_OPT_TEMPDIR,             RTGETOPT_REQ_STRING  },
+    { "--timeout",           VKAT_TEST_OPT_TIMEOUT,             RTGETOPT_REQ_UINT32  },
     { "--vol",               VKAT_TEST_OPT_VOL,                 RTGETOPT_REQ_UINT8   },
     { "--tcp-bind-addr",     VKAT_TEST_OPT_TCP_BIND_ADDRESS,    RTGETOPT_REQ_STRING  },
@@ -754 +756 @@
         case VKAT_TEST_OPT_TAG:                 return "Test set tag to use";
         case VKAT_TEST_OPT_TEMPDIR:             return "Temporary directory to use";
+        case VKAT_TEST_OPT_TIMEOUT:             return "Timeout to use (in ms)\";"
+                                                       "    Default: 5 minutes (300000)";
         case VKAT_TEST_OPT_VOL:                 return "Audio volume (percent) to use";
         case VKAT_TEST_OPT_TCP_BIND_ADDRESS:    return "TCP address listening to (server mode)";
@@ -911 +915 @@
                 if (RT_FAILURE(rc))
                     return RTMsgErrorExit(RTEXITCODE_FAILURE, "Temp dir invalid, rc=%Rrc", rc);
+                break;
+
+            case VKAT_TEST_OPT_TIMEOUT:
+                if (!ValueUnion.u32)
+                    return RTMsgErrorExit(RTEXITCODE_FAILURE, "Invalid timeout value given!");
+                TstEnv.msTimeout = ValueUnion.u32;
                 break;
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Validation Kit Audio Test (VKAT) - Self test code.
+ * Validation Kit Audio Test (VKAT) - Common code.
  */
 
@@ -573 +573 @@
 
         uint64_t        offStream          = 0;
-        uint64_t        nsTimeout          = RT_MS_5MIN_64 * RT_NS_1MS;
+        uint64_t        nsTimeout          = pTstEnv->msTimeout * RT_NS_1MS;
         uint64_t        nsLastMsgCantWrite = 0; /* Timestamp (in ns) when the last message of an unwritable stream was shown. */
         uint64_t        nsLastWrite        = 0;
@@ -877 +877 @@
         uint64_t const  nsStarted         = RTTimeNanoTS();
 
-        uint64_t        nsTimeout         = RT_MS_5MIN_64 * RT_NS_1MS;
+        uint64_t        nsTimeout         = pTstEnv->msTimeout * RT_NS_1MS;
         uint64_t        nsLastMsgCantRead = 0; /* Timestamp (in ns) when the last message of an unreadable stream was shown. */
 
@@ -1473 +1473 @@
 {
     RT_BZERO(pTstEnv, sizeof(AUDIOTESTENV));
+
+    pTstEnv->msTimeout = RT_MS_5MIN; /* Timeout defaults to 5 minutes. */
 
     audioTestIoOptsInitDefaults(&pTstEnv->IoOpts);

trunk/src/VBox/ValidationKit/utils/audio/vkatInternal.h

@@ -255 +255 @@
     /** Audio testing mode. */
     AUDIOTESTMODE           enmMode;
+    /** Failsafe timeout (in ms). Default is 5 minutes. */
+    RTMSINTERVAL            msTimeout;
     /** Whether self test mode is active or not. */
     bool                    fSelftest;