Changeset 19031 in vbox for trunk/src/VBox/Additions/common/VBoxService/VBoxService.cpp

Timestamp:

Apr 20, 2009 2:48:09 PM (16 years ago)

Author:

vboxsync

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

46142

Message:

VBoxService/common: More updates for Windows SCM handling.

File:

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

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

@@ -162 +162 @@
     va_end(va);
 
-#if 0 /* enable after 2.2 */
     va_start(va, pszFormat);
-    LogRel(("%s: error: %N", g_pszProgName, pszFormat, &va));
+    LogRel(("%s: Error: %N", g_pszProgName, pszFormat, &va));
     va_end(va);
-#endif
 
     return 1;
@@ -247 +245 @@
 
 
+unsigned VBoxServiceGetStartedServices(void)
+{
+    unsigned iMain = ~0U;
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+        if (g_aServices[j].fEnabled)
+        {
+            iMain = j;
+            break;
+        }
+
+   return iMain; /* Return the index of the main service (must always come last!). */
+}
+
 /**
  * Starts the service.
@@ -262 +273 @@
      * Initialize the services.
      */
+    VBoxServiceVerbose(2, "Initializing services ...\n");
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
     {
@@ -275 +287 @@
      * Start the service(s).
      */
+    VBoxServiceVerbose(2, "Starting services ...\n");
     rc = VINF_SUCCESS;
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
@@ -282 +295 @@
             continue;
 
+        VBoxServiceVerbose(2, "Starting service     '%s' ...\n", g_aServices[j].pDesc->pszName);
         rc = RTThreadCreate(&g_aServices[j].Thread, VBoxServiceThread, (void *)(uintptr_t)j, 0,
                             RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, g_aServices[j].pDesc->pszName);
@@ -299 +313 @@
     {
         /* The final service runs in the main thread. */
-        VBoxServiceVerbose(1, "starting '%s' in the main thread\n", g_aServices[iMain].pDesc->pszName);
+        VBoxServiceVerbose(1, "Starting '%s' in the main thread\n", g_aServices[iMain].pDesc->pszName);
         rc = g_aServices[iMain].pDesc->pfnWorker(&g_fShutdown);
-        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);
+    }
+
+    /* Should never get here. */
     return rc;
 }
@@ -314 +329 @@
  * clean up anything that we succeeded in starting.
  */
-void VBoxServiceStopServices(void)
-{
+int VBoxServiceStopServices(void)
+{
+    int rc = VINF_SUCCESS;
+
     for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
         ASMAtomicXchgBool(&g_aServices[j].fShutdown, true);
@@ -327 +344 @@
             int rc = RTThreadWait(g_aServices[j].Thread, 30*1000, NULL);
             if (RT_FAILURE(rc))
-                VBoxServiceError("service '%s' failed to stop. (%Rrc)\n", g_aServices[j].pDesc->pszName, rc);
+                VBoxServiceError("Service '%s' failed to stop. (%Rrc)\n", g_aServices[j].pDesc->pszName, rc);
         }
         g_aServices[j].pDesc->pfnTerm();
     }
+
+    VBoxServiceVerbose(2, "Stopping services returned: rc=%Rrc\n", rc);
+    return rc;
 }
 
@@ -336 +356 @@
 int main(int argc, char **argv)
 {
-    int rc;
+    int rc = VINF_SUCCESS;
 
     /*
@@ -351 +371 @@
 
 #ifdef RT_OS_WINDOWS
-    /*
-     * Explain the purpose of this exercise and why ignoring the result is a good idea and everything.
-     */
-    /* Do not use a global namespace ("Global\\") for mutex name here, will blow up NT4 compatibility! */
+    /* Make sure only one instance of VBoxService runs at a time. Create a global mutex for that.    
+       Do not use a global namespace ("Global\\") for mutex name here, will blow up NT4 compatibility! */
     HANDLE hMutexAppRunning = CreateMutex (NULL, FALSE, VBOXSERVICE_NAME);
     if (   hMutexAppRunning != NULL
@@ -492 +510 @@
      * Check that at least one service is enabled.
      */
-    unsigned iMain = ~0U;
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-        if (g_aServices[j].fEnabled)
-        {
-            iMain = j;
-            break;
-        }
+    unsigned iMain = VBoxServiceGetStartedServices();
     if (iMain == ~0U)
         return VBoxServiceSyntax("At least one service must be enabled.\n");
@@ -529 +541 @@
          *        continue.
          */
+        VBoxServiceVerbose(2, "Starting service dispatcher ...\n");
         if (!StartServiceCtrlDispatcher(&g_aServiceTable[0]))
             return VBoxServiceError("StartServiceCtrlDispatcher: %u\n", GetLastError());
-
+        /* Service now lives in the control dispatcher registered above. */
 #else
         VBoxServiceVerbose(1, "Daemonizing...\n");
@@ -540 +553 @@
 #endif
     }
-
-/** @todo Make the main thread responsive to signal so it can shutdown/restart the threads on non-SIGKILL signals. */
-
-#ifdef RT_OS_WINDOWS
-    if (not using StartServiceCtrlDispatcher or auto register & starting the service)
-#endif
-    {
+    else
+    {
+        /** @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.
@@ -554 +564 @@
     }
 
-
 #ifdef RT_OS_WINDOWS
     /*
@@ -560 +569 @@
      */
     if (hMutexAppRunning != NULL)
-        CloseHandle(hMutexAppRunning);
+    {    
+        ::CloseHandle(hMutexAppRunning);
+        hMutexAppRunning = NULL;
+    }
 #endif