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

Timestamp:

May 31, 2021 9:55:04 AM (4 years ago)

Author:

vboxsync

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

144738

Message:

ValKit/AudioTest: Extensible wav-file support. Don't use RTMsgError++ in generic library files, so ferry error info back via RTERRINFO. Set up a release logger instance for the audio test program and point it at stderr. bugref:10008

File:

• trunk/src/VBox/ValidationKit/utils/audio/vkat.cpp (modified) (6 diffs)

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

@@ -48 +48 @@
 
 #include <VBox/version.h>
+#include <VBox/log.h>
 
 #ifdef RT_OS_WINDOWS
@@ -81 +82 @@
             case 'q': \
                 g_uVerbosity = 0; \
+                if (g_pRelLogger) \
+                    RTLogGroupSettings(g_pRelLogger, "all=0 all.e"); \
                 break; \
             \
             case 'v': \
                 g_uVerbosity++; \
+                if (g_pRelLogger) \
+                    RTLogGroupSettings(g_pRelLogger, g_uVerbosity == 1 ? "all.e.l" : g_uVerbosity == 2 ? "all.e.l.f" : "all=~0"); \
                 break; \
             \
@@ -374 +379 @@
 /** The test handle. */
 static RTTEST       g_hTest;
+/** The release logger. */
+static PRTLOGGER    g_pRelLogger = NULL;
 /** The current verbosity level. */
 static unsigned     g_uVerbosity = 0;
@@ -2403 +2410 @@
      * First we must open the file and determin the format.
      */
+    RTERRINFOSTATIC ErrInfo;
     AUDIOTESTWAVEFILE WaveFile;
-    int rc = AudioTestWaveFileOpen(pszFile, &WaveFile);
+    int rc = AudioTestWaveFileOpen(pszFile, &WaveFile, RTErrInfoInitStatic(&ErrInfo));
     if (RT_FAILURE(rc))
-        return RTMsgErrorExitFailure("Failed to open '%s': %Rrc", pszFile, rc);
+        return RTMsgErrorExitFailure("Failed to open '%s': %Rrc%#RTeim", pszFile, rc, &ErrInfo.Core);
 
     if (g_uVerbosity > 0)
@@ -3019 +3027 @@
 
     /*
+     * Configure release logging to go to stderr.
+     */
+    static const char * const g_apszLogGroups[] = VBOX_LOGGROUP_NAMES;
+    int rc = RTLogCreate(&g_pRelLogger, RTLOGFLAGS_PREFIX_THREAD, "all.e.l", "VKAT_RELEASE_LOG",
+                         RT_ELEMENTS(g_apszLogGroups), g_apszLogGroups, RTLOGDEST_STDERR, "vkat-release.log");
+    if (RT_SUCCESS(rc))
+        RTLogRelSetDefaultInstance(g_pRelLogger);
+    else
+        RTMsgWarning("Failed to create release logger: %Rrc", rc);
+
+    /*
      * Process common options.
      */
     RTGETOPTSTATE GetState;
-    int rc = RTGetOptInit(&GetState, argc, argv, g_aCmdCommonOptions,
-                          RT_ELEMENTS(g_aCmdCommonOptions), 1 /*idxFirst*/, 0 /*fFlags - must not sort! */);
+    rc = RTGetOptInit(&GetState, argc, argv, g_aCmdCommonOptions,
+                      RT_ELEMENTS(g_aCmdCommonOptions), 1 /*idxFirst*/, 0 /*fFlags - must not sort! */);
     AssertRCReturn(rc, RTEXITCODE_INIT);
 
@@ -3033 +3052 @@
             case 'q':
                 g_uVerbosity = 0;
+                if (g_pRelLogger)
+                    RTLogGroupSettings(g_pRelLogger, "all=0 all.e");
                 break;
 
             case 'v':
                 g_uVerbosity++;
+                if (g_pRelLogger)
+                    RTLogGroupSettings(g_pRelLogger, g_uVerbosity == 1 ? "all.e.l" : g_uVerbosity == 2 ? "all.e.l.f" : "all=~0");
                 break;