Changeset 102047 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

Timestamp:

Nov 9, 2023 6:27:01 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom/ipc: Rewrote the IPC daemon startup code to use IPRT directly instead of NSPR, bugref:10545

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp (modified) (7 diffs)

trunk/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp

@@ -50 +50 @@
 #endif
 
-#ifdef VBOX
-# include <iprt/initterm.h>
-#endif
+#include <iprt/initterm.h>
+#include <iprt/getopt.h>
+#include <iprt/message.h>
 
 #include "prio.h"
@@ -458 +458 @@
     PRNetAddr addr;
 
-#ifdef VBOX
     /* Set up the runtime without loading the support driver. */
-    RTR3InitExe(argc, &argv, 0);
-#endif
+    int vrc = RTR3InitExe(argc, &argv, 0);
+    if (RT_FAILURE(vrc))
+        return RTMsgInitFailure(vrc);
+
+    /*
+     * Parse the command line.
+     */
+    static RTGETOPTDEF const s_aOptions[] =
+    {
+        { "--inherit-startup-pipe", 'f', RTGETOPT_REQ_UINT32 },
+        { "--socket-path",          'p', RTGETOPT_REQ_STRING },
+    };
+
+    RTGETOPTSTATE State;
+    vrc = RTGetOptInit(&State, argc, argv, &s_aOptions[0], RT_ELEMENTS(s_aOptions), 1,  RTGETOPTINIT_FLAGS_OPTS_FIRST);
+    if (RT_FAILURE(vrc))
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "RTGetOptInit failed: %Rrc", vrc);
+
+    uint32_t        uStartupPipeFd = UINT32_MAX;
+    const char      *pszSocketPath = NULL;
+    RTGETOPTUNION   ValueUnion;
+    int             chOpt;
+    while ((chOpt = RTGetOpt(&State, &ValueUnion)) != 0)
+    {
+        switch (chOpt)
+        {
+            case 'f':
+                uStartupPipeFd = ValueUnion.u32;
+                break;
+            case 'p':
+                pszSocketPath = ValueUnion.psz;
+                break;
+            default:
+                return RTGetOptPrintError(chOpt, &ValueUnion);
+        }
+    }
 
     //
@@ -482 +515 @@
     // set socket address
     addr.local.family = PR_AF_LOCAL;
-    if (argc < 2)
+    if (!pszSocketPath)
         IPC_GetDefaultSocketPath(addr.local.path, sizeof(addr.local.path));
     else
-        PL_strncpyz(addr.local.path, argv[1], sizeof(addr.local.path));
+        PL_strncpyz(addr.local.path, pszSocketPath, sizeof(addr.local.path));
 
 #ifdef IPC_USE_FILE_LOCK
@@ -493 +526 @@
             LOG(("Another daemon is already running, exiting.\n"));
             // send a signal to the blocked parent to indicate success
-            IPC_NotifyParent();
+            IPC_NotifyParent(uStartupPipeFd);
             return 0;
         }
@@ -500 +533 @@
             // don't notify the parent to cause it to fail in PR_Read() after
             // we terminate
-#ifdef VBOX
             if (status != ELockFileOwner)
                 printf("Cannot create a lock file for '%s'.\n"
                         "Check permissions.\n", addr.local.path);
-#endif
             return 0;
         }
@@ -518 +549 @@
     }
     else {
-#ifdef VBOX
         // Use large backlog, as otherwise local sockets can reject connection
         // attempts. Usually harmless, but causes an unnecessary start attempt
@@ -524 +554 @@
         // usually succeeds. But better avoid unnecessary activities.
         if (PR_Listen(listenFD, 128) != PR_SUCCESS) {
-#else /* !VBOX */
-        if (PR_Listen(listenFD, 5) != PR_SUCCESS) {
-#endif /* !VBOX */
             LOG(("PR_Listen failed [%d]\n", PR_GetError()));
         }
         else {
-#ifndef VBOX
-            // redirect all standard file descriptors to /dev/null for
-            // proper daemonizing
-            PR_Close(PR_STDIN);
-            PR_Open("/dev/null", O_RDONLY, 0);
-            PR_Close(PR_STDOUT);
-            PR_Open("/dev/null", O_WRONLY, 0);
-            PR_Close(PR_STDERR);
-            PR_Open("/dev/null", O_WRONLY, 0);
-#endif
-
-            IPC_NotifyParent();
+
+            IPC_NotifyParent(uStartupPipeFd);
 
 #if defined(VBOX) && !defined(XP_OS2)