Changeset 1806 in vbox

Timestamp:

Mar 29, 2007 5:07:44 PM (18 years ago)

Author:

vboxsync

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

19988

Message:

Main: Don't distinguish between VBoxSVC exe locations when taking a decision whether to start a server process or use an existing (instead, use VBox version number for that). This ensures two build flavors of the samve version will use the same server instance, while two different versions will start two independent VBoxSVC instances.

Location:

trunk/src/VBox/Main/linux

Files:

• server.cpp (modified) (4 diffs)
• server.h (added)
• server_module.cpp (modified) (8 diffs)

trunk/src/VBox/Main/linux/server.cpp

@@ -34 +34 @@
 #include <nsILocalFile.h>
 
+#include "linux/server.h"
 #include "Logging.h"
 
@@ -998 +999 @@
         }
 
-        /* get the executable name (will be used below) */
+        /* not really necessary at the moment */
+#if 0
         if (!RTProcGetExecutableName (path, sizeof (path)))
         {
@@ -1004 +1006 @@
             break;
         }
-
-        LogFlowFunc (("Will use \"%s\" as server name.\n", path));
+#endif
 
         nsCOMPtr<nsIServiceManager> servMan;
@@ -1050 +1051 @@
         NS_ADDREF (gIpcServ = ipcServ);
 
-        /* use the executable name as the server name */
-        rc = gIpcServ->AddName (path);
+        LogFlowFunc (("Will use \"%s\" as server name.\n", VBOXSVC_IPC_NAME));
+
+        rc = gIpcServ->AddName (VBOXSVC_IPC_NAME);
         if (NS_FAILED (rc))
         {

trunk/src/VBox/Main/linux/server_module.cpp

@@ -41 +41 @@
 #include <VirtualBox_XPCOM.h>
 
+#include "linux/server.h"
 #include "Logging.h"
 
@@ -72 +73 @@
 };
 
+/** 
+ *  Full path to the VBoxSVC executable.
+ */
+static char VBoxSVCPath [RTPATH_MAX];
+static bool IsVBoxSVCPathSet = false;
+
 /*
  *  The following macros define the method necessary to provide a list of
@@ -80 +87 @@
 NS_DECL_CLASSINFO (VirtualBox)
 NS_IMPL_CI_INTERFACE_GETTER1 (VirtualBox, IVirtualBox)
-
-/** 
- *  Name of the VBoxSVC server-side IPC client.
- *
- *  This name simply matches the full path to the VBoxSVC executable (to
- *  guarantee unicity) so it is also used to start the VBoxSVC process when it
- *  is not started.
- */
-static char VBoxSVCName [RTPATH_MAX];
-static bool IsVBoxSVCNameSet = false;
 
 /** 
@@ -116 +113 @@
         }
 
-        if (!IsVBoxSVCNameSet)
+        if (!IsVBoxSVCPathSet)
         {
             /* Get the directory containing XPCOM components -- the VBoxSVC
@@ -136 +133 @@
                                  rc = NS_ERROR_FAILURE);
 
-                    strcpy (VBoxSVCName, path.get());
-                    RTPathStripFilename (VBoxSVCName);
-                    strcat (VBoxSVCName, VBoxSVC_exe);
+                    strcpy (VBoxSVCPath, path.get());
+                    RTPathStripFilename (VBoxSVCPath);
+                    strcat (VBoxSVCPath, VBoxSVC_exe);
+
+                    IsVBoxSVCPathSet = true;
                 }
             }
@@ -156 +155 @@
         do
         {
-            LogFlowFunc (("Resolving server name \"%s\"...\n", VBoxSVCName));
+            LogFlowFunc (("Resolving server name \"%s\"...\n", VBOXSVC_IPC_NAME));
 
             PRUint32 serverID = 0;
-            rc = ipcServ->ResolveClientName (VBoxSVCName, &serverID);
+            rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
             if (NS_FAILED (rc))
             {
-                LogFlowFunc (("Starting server...\n", VBoxSVCName));
+                LogFlowFunc (("Starting server...\n", VBoxSVCPath));
 
                 startedOnce = true;
 
                 RTPROCESS pid = NIL_RTPROCESS;
-                const char *args[] = { VBoxSVCName, "--automate", 0 };
-                vrc = RTProcCreate (VBoxSVCName, args, NULL, 0, &pid);
+                const char *args[] = { VBoxSVCPath, "--automate", 0 };
+                vrc = RTProcCreate (VBoxSVCPath, args, NULL, 0, &pid);
                 if (VBOX_FAILURE (vrc))
                 {
@@ -179 +178 @@
                 {
                     RTThreadSleep (VBoxSVC_WaitSlice);
-                    rc = ipcServ->ResolveClientName (VBoxSVCName, &serverID);
+                    rc = ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
                     if (NS_SUCCEEDED (rc))
                         break;
@@ -218 +217 @@
             {
                 nsresult rc2 =
-                    ipcServ->ResolveClientName (VBoxSVCName, &serverID);
+                    ipcServ->ResolveClientName (VBOXSVC_IPC_NAME, &serverID);
                 if (NS_SUCCEEDED (rc2))
                     break;