Changeset 29633 in vbox for trunk/src/VBox/Additions/common

Timestamp:

May 18, 2010 1:29:03 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService.cpp: Ignore sigwait interruptions. Attempt to work around SIGCHLD on solaris.

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp (modified) (4 diffs)

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

@@ -363 +363 @@
             VBoxServiceVerbose(1, "Main service '%s' successfully stopped.\n", g_aServices[iMain].pDesc->pszName);
         else /* Only complain if service returned an error. Otherwise the service is a one-timer. */
-            VBoxServiceError("Service '%s' stopped unexpected; rc=%Rrc\n", g_aServices[iMain].pDesc->pszName, rc);           
+            VBoxServiceError("Service '%s' stopped unexpected; rc=%Rrc\n", g_aServices[iMain].pDesc->pszName, rc);
         g_aServices[iMain].pDesc->pfnTerm();
     }
@@ -419 +419 @@
 
 #ifdef RT_OS_WINDOWS
-    /* 
-     * As we're now done terminating all service threads, 
+    /*
+     * As we're now done terminating all service threads,
      * we have to stop the main thread as well (if defined). Note that the termination
      * function will be called in a later context (when the main thread returns from the worker
@@ -430 +430 @@
 
         ASMAtomicXchgBool(&g_fShutdown, true);
-        g_aServices[iMain].pDesc->pfnStop();                      
-    }
-#endif
-    
+        g_aServices[iMain].pDesc->pfnStop();
+    }
+#endif
+
     VBoxServiceVerbose(2, "Stopping services returned: rc=%Rrc\n", rc);
     return rc;
@@ -454 +454 @@
     sigaddset(&signalMask, SIGTERM);
     pthread_sigmask(SIG_BLOCK, &signalMask, NULL);
-    sigwait(&signalMask, &iSignal);
-    VBoxServiceVerbose(3, "VBoxServiceWaitSignal: Received signal %d\n", iSignal);
+
+    do
+        iSignal = -1;
+    while (   sigwait(&signalMask, &iSignal) == -1
+           && (   errno == EINTR
+               || errno == ERESTART));
+
+    VBoxServiceVerbose(3, "VBoxServiceWaitSignal: Received signal %d (errno=%d)\n", iSignal, errno);
 }
 #endif /* !RT_OS_WINDOWS */