Changeset 90117 in vbox

Timestamp:

Jul 9, 2021 11:45:26 AM (4 years ago)

Author:

vboxsync

Message:

Audio/ValKit: Made daemonizing of VKAT / VBoxAudioTest more generic to support all commands. bugref:10008

Location:

trunk/src/VBox/ValidationKit/utils/audio

Files:

• vkat.cpp (modified) (10 diffs)
• vkatInternal.h (modified) (2 diffs)

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

@@ -114 +114 @@
 {
     VKAT_TEST_OPT_COUNT = 900,
-    VKAT_TEST_OPT_DAEMONIZE,
-    VKAT_TEST_OPT_DAEMONIZED,
     VKAT_TEST_OPT_DEV,
     VKAT_TEST_OPT_GUEST_ATS_ADDR,
@@ -149 +147 @@
     { "--quiet",            'q',                                        RTGETOPT_REQ_NOTHING },
     { "--verbose",          'v',                                        RTGETOPT_REQ_NOTHING },
+    { "--daemonize",        AUDIO_TEST_OPT_CMN_DAEMONIZE,               RTGETOPT_REQ_NOTHING },
+    { "--daemonized",       AUDIO_TEST_OPT_CMN_DAEMONIZED,              RTGETOPT_REQ_NOTHING },
     { "--debug-audio",      AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_ENABLE,      RTGETOPT_REQ_NOTHING },
     { "--debug-audio-path", AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_PATH,        RTGETOPT_REQ_STRING  },
@@ -169 +169 @@
     { "--outdir",            VKAT_TEST_OPT_OUTDIR,         RTGETOPT_REQ_STRING  },
     { "--count",             VKAT_TEST_OPT_COUNT,          RTGETOPT_REQ_UINT32  },
-    { "--daemonize",         VKAT_TEST_OPT_DAEMONIZE,      RTGETOPT_REQ_NOTHING },
-    { "--daemonized",        VKAT_TEST_OPT_DAEMONIZED,     RTGETOPT_REQ_NOTHING },
     { "--device",            VKAT_TEST_OPT_DEV,            RTGETOPT_REQ_STRING  },
     { "--pause",             VKAT_TEST_OPT_PAUSE,          RTGETOPT_REQ_UINT32  },
@@ -632 +630 @@
         case 'e':                          return "Exclude the given test id from the list";
         case 'i':                          return "Include the given test id in the list";
-        case VKAT_TEST_OPT_DAEMONIZE:      return "Run in background (daemonized)";
-        case VKAT_TEST_OPT_DEV:            return "Use the specified audio device";
         case VKAT_TEST_OPT_GUEST_ATS_ADDR: return "Address of guest ATS to connect to";
         case VKAT_TEST_OPT_GUEST_ATS_PORT: return "Port of guest ATS to connect to [6042]";
@@ -676 +672 @@
     bool        fPcmSigned    = true;
 
-    bool        fDaemonize    = false;
-    bool        fDaemonized   = false;
-
     const char *pszGuestTcpAddr  = NULL;
     uint16_t    uGuestTcpPort    = ATS_TCP_DEF_BIND_PORT_GUEST;
@@ -746 +739 @@
                 return RTMsgErrorExitFailure("Not yet implemented!");
 
-            case VKAT_TEST_OPT_DAEMONIZE:
-                fDaemonize = true;
-                break;
-
-            case VKAT_TEST_OPT_DAEMONIZED:
-                fDaemonized = true;
-                break;
-
             case VKAT_TEST_OPT_DEV:
                 rc = RTStrCopy(TstEnv.szDev, sizeof(TstEnv.szDev), ValueUnion.psz);
@@ -805 +790 @@
                 if (RT_FAILURE(rc))
                     return RTGetOptPrintError(ch, &ValueUnion);
-        }
-    }
-
-    /*
-     * Daemonize ourselves if asked to.
-     */
-    if (fDaemonize)
-    {
-        if (!fDaemonized)
-        {
-            if (g_uVerbosity > 0)
-                RTMsgInfo("Daemonizing...");
-            rc = RTProcDaemonize(pGetState->argv, "--daemonized");
-            if (RT_FAILURE(rc))
-                return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTProcDaemonize: %Rrc\n", rc);
-            return RTEXITCODE_SUCCESS;
-        }
-        else
-        {
-            if (g_uVerbosity > 0)
-                RTMsgInfo("Running daemonized ...");
         }
     }
@@ -1182 +1146 @@
 {
     /*
-     * Init IPRT and globals.
+     * Init IPRT.
      */
-    RTEXITCODE rcExit = RTTestInitAndCreate("AudioTest", &g_hTest);
-    if (rcExit != RTEXITCODE_SUCCESS)
-        return rcExit;
+    int rc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(rc))
+    {
+        RTPrintf("RTR3InitExe() failed with %Rrc\n", rc);
+        return RTMsgInitFailure(rc);
+    }
+
+    /*
+     * Daemonize ourselves if asked to.
+     */
+    bool fDaemonize  = false;
+    bool fDaemonized = false;
+
+    for (int i = 1; i < argc; i++)
+    {
+        const char *psz = argv[i];
+        if (!RTStrICmp(psz, "--daemonize"))
+        {
+            fDaemonize = true;
+            continue;
+        }
+        else if (!RTStrICmp(psz, "--daemonized"))
+        {
+            fDaemonized = true;
+            continue;
+        }
+    }
+
+    if (fDaemonize)
+    {
+        if (!fDaemonized)
+        {
+            rc = RTProcDaemonize(argv, "--daemonized");
+            if (RT_FAILURE(rc))
+                return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTProcDaemonize() failed with %Rrc\n", rc);
+
+            RTMsgInfo("Starting in background (daemonizing) ...");
+            return RTEXITCODE_SUCCESS;
+        }
+        /* else continue running in background. */
+    }
+
+    /*
+     * Init test and globals.
+     * Note: Needs to be done *after* daemonizing, otherwise the child will fail!
+     */
+    rc = RTTestCreate("AudioTest", &g_hTest);
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTTestCreate() failed with %Rrc\n", rc);
 
 #ifdef RT_OS_WINDOWS
@@ -1198 +1208 @@
      */
     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, NULL /*"vkat-release.log"*/);
+    rc = RTLogCreate(&g_pRelLogger, RTLOGFLAGS_PREFIX_THREAD, "all.e.l", "VKAT_RELEASE_LOG",
+                     RT_ELEMENTS(g_apszLogGroups), g_apszLogGroups, RTLOGDEST_STDERR, NULL /*"vkat-release.log"*/);
     if (RT_SUCCESS(rc))
         RTLogRelSetDefaultInstance(g_pRelLogger);
@@ -1268 +1278 @@
                             if (RT_SUCCESS(rc))
                             {
-                                rcExit = pCmd->pfnHandler(&GetState);
+                                RTEXITCODE rcExit = pCmd->pfnHandler(&GetState);
                                 RTMemFree(paCombinedOptions);
                                 return rcExit;

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

@@ -478 +478 @@
 enum
 {
-    AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_ENABLE = 256,
+    AUDIO_TEST_OPT_CMN_DAEMONIZE = 256,
+    AUDIO_TEST_OPT_CMN_DAEMONIZED,
+    AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_ENABLE,
     AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_PATH
 };
@@ -509 +511 @@
             case AUDIO_TEST_OPT_CMN_DEBUG_AUDIO_PATH: \
                 g_pszDrvAudioDebug = (a_ValueUnion).psz; \
-                break
+                break; \
+            case AUDIO_TEST_OPT_CMN_DAEMONIZE: \
+                break; \
+            case AUDIO_TEST_OPT_CMN_DAEMONIZED: \
+                break;
 
 #endif /* !VBOX_INCLUDED_SRC_audio_vkatInternal_h */