Changeset 54010 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 28, 2015 12:21:54 PM (10 years ago)

Author:

vboxsync

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

97918

Message:

Additions/common/VBoxGuestLib: add respawn counter to Daemonize().

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) (1 diff)

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

@@ -69 +69 @@
  * @param   fRespawn    Restart the daemonised process after five seconds if it
  *                      terminates abnormally.
+ * @param   pcRespawn   Where to store a count of how often we have respawned,
+ *                      intended for avoiding error spamming.  Optional.
  *
  * @todo    Use RTProcDaemonize instead of this.
@@ -75 +77 @@
  *          actually needs that.
  */
-VBGLR3DECL(int) VbglR3Daemonize(bool fNoChDir, bool fNoClose, bool fRespawn)
+VBGLR3DECL(int) VbglR3Daemonize(bool fNoChDir, bool fNoClose, bool fRespawn, unsigned *pcRespawn)
 {
 #if defined(RT_OS_OS2)
@@ -219 +221 @@
 
     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. */
+        unsigned cRespawn = 0;
         for (;;)
         {
             int iStatus, rcWait;
 
+            if (pcRespawn != NULL)
+                *pcRespawn = cRespawn;
             pid = fork();
             if (pid == -1)
@@ -239 +245 @@
                 exit(0);
             sleep(5);
+            ++cRespawn;
         }
+    }
     return VINF_SUCCESS;
 #endif

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

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

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

@@ -371 +371 @@
         VBClFatalError(("Creating pid-file path: %Rrc\n", rc));
     if (fDaemonise)
-        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn);
+        rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn, NULL);
     if (RT_FAILURE(rc))
         VBClFatalError(("Daemonizing: %Rrc\n", rc));