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

Timestamp:

Apr 3, 2009 7:44:47 AM (16 years ago)

Author:

vboxsync

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

45599

Message:

Guest Additions/common: Update.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (7 diffs)
• VBoxServiceInternal.h (modified) (1 diff)

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

@@ -36 +36 @@
 #include <iprt/asm.h>
 #include <iprt/path.h>
+#include <VBox/Log.h>
 #include <VBox/VBoxGuest.h>
 #include "VBoxServiceInternal.h"
@@ -158 +159 @@
 int VBoxServiceError(const char *pszFormat, ...)
 {
+    char szBuffer[1024] = { 0 };
     RTStrmPrintf(g_pStdErr, "%s: error: ", g_pszProgName);
 
@@ -163 +165 @@
     va_start(va, pszFormat);
     RTStrmPrintfV(g_pStdErr, pszFormat, va);
+
+    RTStrPrintfV(szBuffer, sizeof(szBuffer), pszFormat, va);
+    LogRel((szBuffer));
+
     va_end(va);
 
@@ -184 +190 @@
         va_start(va, pszFormat);
         RTStrmPrintfV(g_pStdOut, pszFormat, va);
+
+#ifdef _DEBUG
+        char szBuffer[1024] = { 0 };
+        RTStrPrintfV(szBuffer, sizeof(szBuffer), pszFormat, va);
+        LogRel((szBuffer));
+#endif
+
         va_end(va);
     }
@@ -239 +252 @@
 }
 
+int VBoxServiceStartServices(int iMain)
+{
+    int rc = 0;
+
+    /*
+     * Initialize the services.
+     */
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+    {
+        rc = g_aServices[j].pDesc->pfnInit();
+        if (RT_FAILURE(rc))
+            return VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName);
+    }
+
+    if (iMain == 0) /* If 0 is specified, start all services. Useful for the Windows SCM stuff. */
+        iMain = RT_ELEMENTS(g_aServices);
+
+    /*
+     * Start the service(s).
+     */
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+    {
+        if (    !g_aServices[j].fEnabled
+            ||  j == iMain)
+            continue;
+
+        rc = RTThreadCreate(&g_aServices[j].Thread, VBoxServiceThread, (void *)(uintptr_t)j, 0,
+                            RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, g_aServices[j].pDesc->pszName);
+        if (RT_FAILURE(rc))
+        {
+            VBoxServiceError("RTThreadCreate failed, rc=%Rrc\n", rc);
+            break;
+        }
+        g_aServices[j].fStarted = true;
+
+        /* wait for the thread to initialize */
+        RTThreadUserWait(g_aServices[j].Thread, 60 * 1000);
+        if (g_aServices[j].fShutdown)
+            rc = VERR_GENERAL_FAILURE;
+    }
+    if (RT_SUCCESS(rc))
+    {
+        /* The final service runs in the main thread. */
+        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);
+    }
+
+    return rc;
+}
+
+/*
+ * Stops and terminates the services.
+ */
+int VBoxServiceStopServices()
+{
+    int rc = 0;
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+        ASMAtomicXchgBool(&g_aServices[j].fShutdown, true);
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+        if (g_aServices[j].fStarted)
+            g_aServices[j].pDesc->pfnStop();
+    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
+    {
+        if (g_aServices[j].Thread != NIL_RTTHREAD)
+        {
+            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);
+        }
+        g_aServices[j].pDesc->pfnTerm();
+    }
+
+    return rc;
+}
+
 int main(int argc, char **argv)
 {
@@ -279 +368 @@
         if(    (*psz != '-')
 #if defined(RT_OS_WINDOWS)
-            && (*psz != '/')
-#endif
-        )
+            && (*psz != '/'))
+#endif
             return VBoxServiceSyntax("Unknown argument '%s'\n", psz);
-
         psz++;
 
@@ -441 +528 @@
 /** @todo Make the main thread responsive to signal so it can shutdown/restart the threads on non-SIGKILL signals. */
 
-    /*
-     * Initialize the services.
-     */
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-    {
-        rc = g_aServices[j].pDesc->pfnInit();
-        if (RT_FAILURE(rc))
-            return VBoxServiceError("Service '%s' failed pre-init: %Rrc\n", g_aServices[j].pDesc->pszName);
-    }
-
-    /*
-     * Start the service(s).
-     */
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-    {
-        if (    !g_aServices[j].fEnabled
-            ||  j == iMain)
-            continue;
-
-        rc = RTThreadCreate(&g_aServices[j].Thread, VBoxServiceThread, (void *)(uintptr_t)j, 0,
-                            RTTHREADTYPE_DEFAULT, RTTHREADFLAGS_WAITABLE, g_aServices[j].pDesc->pszName);
-        if (RT_FAILURE(rc))
-        {
-            VBoxServiceError("RTThreadCreate failed, rc=%Rrc\n", rc);
-            break;
+    rc = VBoxServiceStartServices(iMain);
+
+#if defined(RT_OS_WINDOWS)
+    if (fDaemonize && fDaemonzied)
+    {
+        while (1) {
+            Sleep (100);       /** @todo */
         }
-        g_aServices[j].fStarted = true;
-
-        /* wait for the thread to initialize */
-        RTThreadUserWait(g_aServices[j].Thread, 60 * 1000);
-        if (g_aServices[j].fShutdown)
-            rc = VERR_GENERAL_FAILURE;
-    }
-    if (RT_SUCCESS(rc))
-    {
-        /* The final service runs in the main thread. */
-        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);
-    }
-
-    /*
-     * Stop and terminate the services.
-     */
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-        ASMAtomicXchgBool(&g_aServices[j].fShutdown, true);
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-        if (g_aServices[j].fStarted)
-            g_aServices[j].pDesc->pfnStop();
-    for (unsigned j = 0; j < RT_ELEMENTS(g_aServices); j++)
-    {
-        if (g_aServices[j].Thread != NIL_RTTHREAD)
-        {
-            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);
-        }
-        g_aServices[j].pDesc->pfnTerm();
-    }
-
-    return 0;
-}
-
+    }
+#endif
+
+    rc = VBoxServiceStopServices();
+
+#if defined(RT_OS_WINDOWS)
+    /* Release instance mutex. */
+    if (hMutexAppRunning != NULL) {
+        CloseHandle (hMutexAppRunning);
+        hMutexAppRunning = NULL;
+    }
+#endif
+    return rc;
+}
+

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h

@@ -111 +111 @@
 extern void VBoxServiceVerbose(int iLevel, const char *pszFormat, ...);
 extern int VBoxServiceArgUInt32(int argc, char **argv, const char *psz, int *pi, uint32_t *pu32, uint32_t u32Min, uint32_t u32Max);
+extern int VBoxServiceStartServices(int iMain);
+extern int VBoxServiceStopServices();
 
 #if defined(RT_OS_WINDOWS)