Changeset 28599 in vbox for trunk/src/VBox/Additions/common/VBoxService

Timestamp:

Apr 22, 2010 2:48:16 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService: properly shutdown the serice on normal signals; cosmetic fixes

File:

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

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

@@ -30 +30 @@
 #endif
 #include <errno.h>
-
+#ifndef RT_OS_WINDOWS
+# include <signal.h>
+#endif
+
+#include "product-generated.h"
 #include <iprt/asm.h>
 #include <iprt/buildconfig.h>
@@ -133 +137 @@
         RTPrintf("    --enable-%-10s Enables the %s service. (default)\n", g_aServices[j].pDesc->pszName, g_aServices[j].pDesc->pszName);
         RTPrintf("    --disable-%-9s Disables the %s service.\n", g_aServices[j].pDesc->pszName, g_aServices[j].pDesc->pszName);
-        RTPrintf("%s", g_aServices[j].pDesc->pszOptions);
+        if (g_aServices[j].pDesc->pszOptions)
+            RTPrintf("%s", g_aServices[j].pDesc->pszOptions);
     }
     RTPrintf("\n"
-             " Copyright (C) 2009 Sun Microsystems, Inc.\n");
+             " Copyright (C) 2009-" VBOX_C_YEAR " " VBOX_VENDOR "\n");
 
     return 1;
@@ -385 +390 @@
     VBoxServiceVerbose(2, "Stopping services returned: rc=%Rrc\n", rc);
     return rc;
+}
+
+/**
+ * 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();
 }
 
@@ -603 +621 @@
          * Start the service, enter the main threads run loop and stop them again when it returns.
          */
+#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);
         VBoxServiceStopServices();