Changeset 103300 in vbox for trunk/src/VBox

Timestamp:

Feb 11, 2024 8:33:57 PM (12 months ago)

Author:

vboxsync

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

161594

Message:

libs/xpcom,Main: Disabled code to move VBoxXPCOMIPCD into VBoxSVC, bugref:10594

Location:

trunk/src/VBox/Main

Files:

• Makefile.kmk (modified) (2 diffs)
• src-server/xpcom/server.cpp (modified) (3 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -546 +546 @@
         $(if $(VBOX_WITH_NATIVE_NEM),VBOX_WITH_NATIVE_NEM,) \
         $(if $(VBOX_WITH_IEM_NATIVE_RECOMPILER),VBOX_WITH_IEM_NATIVE_RECOMPILER,) \
-        $(if $(VBOX_WITH_DRIVERLESS_FORCED),VBOX_WITH_DRIVERLESS_FORCED,)
+        $(if $(VBOX_WITH_DRIVERLESS_FORCED),VBOX_WITH_DRIVERLESS_FORCED,) \
+        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC,)
+
  ifdef VBOX_WITH_USB
   VBoxSVC_DEFS += \
@@ -579 +581 @@
         $(PATH_STAGE_LIB)/VBoxAPIWrap$(VBOX_SUFF_LIB) \
         $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \
+        $(if $(VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC),$(LIB_VBOXXPCOMIPCD),)\
         $(LIB_DDU)
 

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

@@ -664 +664 @@
 }
 
+#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)
 {
@@ -824 +832 @@
     };
 
+#ifdef VBOX_WITH_XPCOMIPCD_IN_VBOX_SVC
+    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 */
     {
@@ -1003 +1018 @@
         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");