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

Timestamp:

Jul 8, 2021 2:37:49 PM (4 years ago)

Author:

vboxsync

Message:

Reverted r145598 (Audio/ValKit: Use RTProcDaemonizeUsingFork() and also added PID file support to VKAT / VBoxAudioTest) -- IPRT only has this implementation for POSIX so far. bugref:10008

File:

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

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

@@ -129 +129 @@
     VKAT_TEST_OPT_PCM_CHAN,
     VKAT_TEST_OPT_PCM_SIGNED,
-    VKAT_TEST_OPT_PIDFILE,
     VKAT_TEST_OPT_TAG,
     VKAT_TEST_OPT_TEMPDIR,
@@ -178 +177 @@
     { "--pcm-hz",            VKAT_TEST_OPT_PCM_HZ,         RTGETOPT_REQ_UINT16  },
     { "--pcm-signed",        VKAT_TEST_OPT_PCM_SIGNED,     RTGETOPT_REQ_BOOL    },
-    { "--pidfile",           VKAT_TEST_OPT_PIDFILE,        RTGETOPT_REQ_STRING  },
     { "--mode",              VKAT_TEST_OPT_MODE,           RTGETOPT_REQ_STRING  },
     { "--no-verify",         VKAT_TEST_OPT_NO_VERIFY,      RTGETOPT_REQ_NOTHING },
@@ -648 +646 @@
         case VKAT_TEST_OPT_PCM_CHAN:       return "Specifies the number of PCM channels to use [2]";
         case VKAT_TEST_OPT_PCM_SIGNED:     return "Specifies whether to use signed (true) or unsigned (false) samples [true]";
-        case VKAT_TEST_OPT_PIDFILE:        return "Specifies the PID file to use (for daemonizing)";
         case VKAT_TEST_OPT_TAG:            return "Specifies the test set tag to use";
         case VKAT_TEST_OPT_TEMPDIR:        return "Specifies the temporary directory to use";
@@ -679 +676 @@
     bool        fPcmSigned    = true;
 
-    const char *pszPidFile    = NULL;
     bool        fDaemonize    = false;
     bool        fDaemonized   = false;
@@ -789 +785 @@
                 break;
 
-            case VKAT_TEST_OPT_PIDFILE:
-                pszPidFile = ValueUnion.psz;
-                break;
-
             case VKAT_TEST_OPT_TAG:
                 pszTag = ValueUnion.psz;
@@ -824 +816 @@
         {
             if (g_uVerbosity > 0)
-            {
-                RTMsgInfo("Starting in background (as daemon) ...");
-                if (pszPidFile)
-                    RTMsgInfo("Using PID file '%s'", pszPidFile);
-            }
-            rc = RTProcDaemonizeUsingFork(true /* fNoChDir */, false /* fNoClose */, pszPidFile);
+                RTMsgInfo("Daemonizing...");
+            rc = RTProcDaemonize(pGetState->argv, "--daemonized");
             if (RT_FAILURE(rc))
-                return RTMsgErrorExit(RTEXITCODE_FAILURE, "Failed to daemonize: %Rrc\n", rc);
+                return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTProcDaemonize: %Rrc\n", rc);
+            return RTEXITCODE_SUCCESS;
         }
         else
         {
             if (g_uVerbosity > 0)
-                RTMsgInfo("Running in background (as daemon) ...");
+                RTMsgInfo("Running daemonized ...");
         }
     }