Changeset 39459 in vbox for trunk/src/VBox

Timestamp:

Nov 29, 2011 2:12:58 PM (13 years ago)

Author:

vboxsync

Message:

VBoxSVC: logging and --shutdown-delay.

File:

• trunk/src/VBox/Main/src-server/xpcom/server.cpp (modified) (10 diffs)

trunk/src/VBox/Main/src-server/xpcom/server.cpp

@@ -226 +226 @@
 ////////////////////////////////////////////////////////////////////////////////
 
-enum
-{
-    /* Delay before shutting down the VirtualBox server after the last
-     * VirtualBox instance is released, in ms */
-    VBoxSVC_ShutdownDelay = 5000
-};
-
 static bool gAutoShutdown = false;
+/** Delay before shutting down the VirtualBox server after the last
+ * VirtualBox instance is released, in ms */
+static uint32_t gShutdownDelayMs = 5000;
 
 static nsIEventQueue  *gEventQ          = nsnull;
@@ -344 +340 @@
             {
                 LogFlowFunc(("Last VirtualBox instance was released.\n"));
-                LogFlowFunc(("Scheduling server shutdown in %d ms...\n",
-                             VBoxSVC_ShutdownDelay));
+                LogFlowFunc(("Scheduling server shutdown in %u ms...\n",
+                             gShutdownDelayMs));
 
                 /* make sure the previous timer (if any) is stopped;
@@ -351 +347 @@
                 RTTimerLRStop(sTimer);
 
-                int vrc = RTTimerLRStart(sTimer, uint64_t(VBoxSVC_ShutdownDelay) * 1000000);
+                int vrc = RTTimerLRStart(sTimer, gShutdownDelayMs * RT_NS_1MS_64);
                 AssertRC(vrc);
                 timerStarted = SUCCEEDED(vrc);
@@ -405 +401 @@
         void *handler()
         {
-            LogFlowFunc(("\n"));
+            LogFlowFuncEnter();
 
             Assert(RTCritSectIsInitialized(&sLock));
@@ -432 +428 @@
                     gKeepRunning = PR_FALSE;
                 }
+                else
+                    LogFlowFunc(("No automatic shutdown.\n"));
             }
             else
@@ -443 +441 @@
             RTCritSectLeave(&sLock);
 
+            LogFlowFuncLeave();
             return NULL;
         }
@@ -798 +797 @@
         { "--auto-shutdown",    'A', RTGETOPT_REQ_NOTHING },
         { "--daemonize",        'd', RTGETOPT_REQ_NOTHING },
-        { "--pidfile",          'p', RTGETOPT_REQ_STRING  },
+        { "--shutdown-delay",   'D', RTGETOPT_REQ_UINT32 },
+        { "--pidfile",          'p', RTGETOPT_REQ_STRING },
         { "--logfile",          'F', RTGETOPT_REQ_STRING },
         { "--logrotate",        'R', RTGETOPT_REQ_UINT32 },
@@ -822 +822 @@
         {
             case 'a':
-            {
                 /* --automate mode means we are started by XPCOM on
                  * demand. Daemonize ourselves and activate
@@ -829 +828 @@
                 fDaemonize = true;
                 break;
-            }
-
-            /* --auto-shutdown mode means we're already daemonized. */
+
             case 'A':
-            {
+                /* --auto-shutdown mode means we're already daemonized. */
                 gAutoShutdown = true;
                 break;
-            }
 
             case 'd':
-            {
                 fDaemonize = true;
                 break;
-            }
+
+            case 'D':
+                gShutdownDelayMs = ValueUnion.u32;
+                break;
 
             case 'p':
-            {
                 g_pszPidFile = ValueUnion.psz;
                 break;
-            }
 
             case 'F':
@@ -867 +863 @@
 
             case 'h':
-            {
                 RTPrintf("no help\n");
                 return 1;
-            }
 
             case 'V':
-            {
                 RTPrintf("%sr%s\n", RTBldCfgVersion(), RTBldCfgRevisionStr());
                 return 0;
-            }
 
             default: