Changeset 103331 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Feb 13, 2024 10:45:22 AM (11 months ago)

Author:

vboxsync

Message:

Config.kmk,Main,libs/xpcom,HostDrivers/Support,Installer: Make VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC the default and remove the deprecated code, bugref:10594

File:

• trunk/src/VBox/Main/src-server/xpcom/server.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -51 +51 @@
 #include <iprt/pipe.h>
 #include <iprt/process.h>
+#include <iprt/thread.h>
 #include <iprt/timer.h>
 #include <iprt/env.h>
@@ -112 +113 @@
 NS_DECL_CI_INTERFACE_GETTER(VirtualBoxWrap)
 
+/* Living in VBoxXPCOMIPCD. */
+DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdCreate(PRTTHREAD phThrdIpcd);
+DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdDestroy(RTTHREAD hThrdIpcd);
+
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -664 +669 @@
 }
 
-#ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
-
-#include <iprt/thread.h>
-
-DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdCreate(PRTTHREAD phThrdIpcd);
-DECL_IMPORT_NOTHROW(int) RTCALL VBoxXpcomIpcdDestroy(RTTHREAD hThrdIpcd);
-#endif
+
 
 int main(int argc, char **argv)
@@ -832 +831 @@
     };
 
-#ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
+    /* Spawn the IPC message I/O thread. */
     RTTHREAD hThrdIpcd = NIL_RTTHREAD;
     vrc = VBoxXpcomIpcdCreate(&hThrdIpcd);
     if (RT_FAILURE(vrc))
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to create IPC daemon thread -> %Rrc", vrc);
-#endif
 
     do /* goto avoidance only */
@@ -1018 +1016 @@
         RTMsgError("Failed to shutdown XPCOM! (rc=%Rhrc)", rc);
 
-#ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
     vrc = VBoxXpcomIpcdDestroy(hThrdIpcd);
     AssertRC(vrc);
-#endif
 
     RTPrintf("XPCOM server has shutdown.\n");