Changeset 53421 in vbox for trunk/src

Timestamp:

Dec 1, 2014 4:00:30 PM (10 years ago)

Author:

vboxsync

Message:

VBoxGuestLib: add re-spawn option to VbglR3Daemonize().

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp (modified) (4 diffs)
• common/VBoxService/VBoxService.cpp (modified) (1 diff)
• x11/VBoxClient/main.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp

@@ -43 +43 @@
 # include <sys/types.h>
 # include <sys/stat.h>
+# include <sys/wait.h>
 # include <stdio.h>
 # include <fcntl.h>
@@ -66 +67 @@
  * @param   fNoChDir    Pass false to change working directory to root.
  * @param   fNoClose    Pass false to redirect standard file streams to /dev/null.
+ * @param   fRespawn    Restart the daemonised process after five seconds if it
+ *                      terminates abnormally.
  *
  * @todo    Use RTProcDaemonize instead of this.
- */
-VBGLR3DECL(int) VbglR3Daemonize(bool fNoChDir, bool fNoClose)
+ * @todo    Implement fRespawn on OS/2.
+ * @todo    Make the respawn interval configurable.  But not until someone
+ *          actually needs that.
+ */
+VBGLR3DECL(int) VbglR3Daemonize(bool fNoChDir, bool fNoClose, bool fRespawn)
 {
 #if defined(RT_OS_OS2)
@@ -76 +82 @@
     DosGetInfoBlocks(&pTib, &pPib);
 
+    AssertRelease(!fRespawn);
     /* Get the full path to the executable. */
     char szExe[CCHMAXPATH];
@@ -211 +218 @@
 # endif /* RT_OS_LINUX */
 
+    if (fRespawn)
+        /* We implement re-spawning as a third fork(), with the parent process
+         * monitoring the child and re-starting it after a delay if it exits
+         * abnormally. */
+        for (;;)
+        {
+            int iStatus, rcWait;
+
+            pid = fork();
+            if (pid == -1)
+                return RTErrConvertFromErrno(errno);
+            if (pid == 0)
+                return VINF_SUCCESS;
+            do
+                rcWait = waitpid(pid, &iStatus, 0);
+            while (rcWait == -1 && errno == EINTR);
+            if (rcWait == -1)
+                exit(1);
+            if (WIFEXITED(iStatus) && WEXITSTATUS(iStatus) == 0)
+                exit(0);
+            sleep(5);
+        }
     return VINF_SUCCESS;
 #endif

trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

@@ -1098 +1098 @@
 #else
         VBoxServiceVerbose(1, "Daemonizing...\n");
-        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */);
+        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */,
+                             false /* fRespawn */);
         if (RT_FAILURE(rc))
             return VBoxServiceError("Daemon failed: %Rrc\n", rc);

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -271 +271 @@
 int main(int argc, char *argv[])
 {
-    bool fDaemonise = true;
+    bool fDaemonise = true, fRespawn = true;
     int rc;
     const char *pcszFileName, *pcszStage;
@@ -311 +311 @@
             fDaemonise = false;
         }
+        else if (!strcmp(argv[i], "--no-respawn"))
+        {
+            fRespawn = false;
+        }
         else if (!strcmp(argv[i], "--clipboard"))
         {
@@ -373 +377 @@
         VBClFatalError(("Creating pid-file path: %Rrc\n", rc));
     if (fDaemonise)
-        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */);
+        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn);
     if (RT_FAILURE(rc))
         VBClFatalError(("Daemonizing: %Rrc\n", rc));