Changeset 28603 in vbox

Timestamp:

Apr 22, 2010 3:48:25 PM (15 years ago)

Author:

vboxsync

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

60450

Message:

VBoxService: improved POSIX shutdown mechanism

File:

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

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

@@ -259 +259 @@
 {
     const unsigned i = (uintptr_t)pvUser;
+
+#ifndef RT_OS_WINDOWS
+    /* 
+     * Block all signals for this thread. Only the main thread will handle signals.
+     */
+    sigset_t signalMask;
+    sigfillset(&signalMask);
+    pthread_sigmask(SIG_BLOCK, &signalMask, NULL);
+#endif
+
     int rc = g_aServices[i].pDesc->pfnWorker(&g_aServices[i].fShutdown);
     ASMAtomicXchgBool(&g_aServices[i].fShutdown, true);
@@ -336 +346 @@
         }
     }
-    if (RT_SUCCESS(rc))
+    if (   RT_SUCCESS(rc)
+        && iMain != ~0U)
     {
         /* The final service runs in the main thread. */
@@ -393 +404 @@
 
 #ifndef RT_OS_WINDOWS
-/**
- * Signal handler for properly shutting down the services on Posix platforms.
- */
-static void VBoxServiceSignalHandler(int /* sig */)
-{
-    VBoxServiceVerbose(2, "VBoxServiceSignalHandler hit\n");
-    /* Flag the main service that we want to terminate */
-    g_fShutdown = 1;
-    unsigned iMain = VBoxServiceGetStartedServices();
-    /* Get the main thread out of the waiting loop */
-    g_aServices[iMain].pDesc->pfnStop();
+/*
+ * Block all important signals, then explicitly wait until one of these signal arrives.
+ */
+static void VBoxServiceWaitSignal(void)
+{
+    sigset_t signalMask;
+    int iSignal;
+    sigemptyset(&signalMask);
+    sigaddset(&signalMask, SIGHUP);
+    sigaddset(&signalMask, SIGINT);
+    sigaddset(&signalMask, SIGQUIT);
+    sigaddset(&signalMask, SIGABRT);
+    sigaddset(&signalMask, SIGTERM);
+    pthread_sigmask(SIG_BLOCK, &signalMask, NULL);
+    sigwait(&signalMask, &iSignal);
+    VBoxServiceVerbose(3, "VBoxServiceWaitSignal: Received signal %d\n", iSignal);
 }
 #endif
@@ -578 +594 @@
     if (iMain == ~0U)
         return VBoxServiceSyntax("At least one service must be enabled.\n");
+
+#ifndef RT_OS_WINDOWS
+    /* 
+     * POSIX: No main service thread.
+     */
+    iMain = ~0U;
+#endif
 
     VBoxServiceVerbose(0, "%s r%s started. Verbose level = %d\n",
@@ -618 +641 @@
         /* Run the app just like a console one if not daemonized. */
 #endif
-        /** @todo Make the main thread responsive to signal so it can shutdown/restart the threads on non-SIGKILL signals. */
-
         /*
-         * Start the service, enter the main threads run loop and stop them again when it returns.
+         * Windows: Start the services, enter the main threads' run loop and stop them
+         * again when it returns.
+         *
+         * POSIX: Start all services and return immediately.
          */
+        rc = VBoxServiceStartServices(iMain);
 #ifndef RT_OS_WINDOWS
-        struct sigaction sa;
-        sa.sa_handler = VBoxServiceSignalHandler;
-        sigemptyset(&sa.sa_mask);
-        sa.sa_flags = 0;
-        sigaction(SIGHUP, &sa, NULL);
-        sigaction(SIGINT, &sa, NULL);
-        sigaction(SIGQUIT, &sa, NULL);
-        sigaction(SIGABRT, &sa, NULL);
-        sigaction(SIGTERM, &sa, NULL);
-#endif
-        rc = VBoxServiceStartServices(iMain);
+        VBoxServiceWaitSignal();
+#endif
         VBoxServiceStopServices();
 #ifdef RT_OS_WINDOWS