Changeset 3388 in vbox for trunk/src/VBox/Main

Timestamp:

Jul 3, 2007 11:42:41 AM (18 years ago)

Author:

vboxsync

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

22586

Message:

Main: Properly daemonize VBoxSVC.exe on OS/2.

Location:

trunk/src/VBox/Main/linux

Files:

• server.cpp (modified) (4 diffs)
• server_module.cpp (modified) (3 diffs)

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

@@ -984 +984 @@
     }
 
+    static RTFILE pidFile = NIL_RTFILE;
+
+#ifdef __OS2__
+
+    /* nothing to do here, the process is supposed to be already
+     * started daemonized when it is necessary */  
+    NOREF(fDaemonize);
+
+#else // ifdef __OS2__
+
     static int daemon_pipe_fds[2];
-    static RTFILE pidFile = NIL_RTFILE;
 
     if (fDaemonize)
@@ -1046 +1055 @@
         close(daemon_pipe_fds[0]);
     }
+
+#endif // ifdef __OS2__
 
 #if defined(USE_BACKTRACE)
@@ -1161 +1172 @@
         {
             printf ("\nStarting event loop....\n[send TERM signal to quit]\n");
+#ifndef __OS2__
             /* now we're ready, signal the parent process */
             write(daemon_pipe_fds[1], "READY", strlen("READY"));
+#endif
         }
         else
@@ -1220 +1233 @@
     if (fDaemonize)
     {
+#ifndef __OS2__
         /* close writing end of the pipe as well */
         close(daemon_pipe_fds[1]);
+#endif
     }
 

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

@@ -20 +20 @@
  */
 
+#ifdef __OS2__
+# include <prproces.h>
+#endif
+
 #include <nsMemory.h>
 #include <nsString.h>
@@ -165 +169 @@
                 startedOnce = true;
 
+#ifdef __OS2__
+                char *const args[] = { VBoxSVCPath, "--automate", 0 };
+                /* use NSPR because we want the process to be detached right
+                 * at startup (it isn't possible to detach it later on) */
+                PRStatus rv = PR_CreateProcessDetached (VBoxSVCPath,
+                                                        args, NULL, 0);
+                if (rv != PR_SUCCESS)
+                {
+                    rc = NS_ERROR_FAILURE;
+                    break;
+                }
+#else
+                const char *args[] = { VBoxSVCPath, "--automate", 0 };
                 RTPROCESS pid = NIL_RTPROCESS;
-                const char *args[] = { VBoxSVCPath, "--automate", 0 };
                 vrc = RTProcCreate (VBoxSVCPath, args, NULL, 0, &pid);
                 if (VBOX_FAILURE (vrc))
@@ -173 +189 @@
                     break;
                 }
+#endif
 
                 /* wait for the server process to establish a connection */