Changeset 61714 in vbox for trunk/src/VBox/Main/src-server/xpcom

Timestamp:

Jun 15, 2016 1:16:38 PM (9 years ago)

Author:

vboxsync

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

108082

Message:

Main/xpcom/server.cpp: change the behavior of the SIGUSR1 signal handling: now it gracefully terminates an idle VBoxSVC even if it's not started with the autoterminate flag

File:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2004-2015 Oracle Corporation
+ * Copyright (C) 2004-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -211 +211 @@
     class MaybeQuitEvent : public NativeEvent
     {
+    public:
+        MaybeQuitEvent() :
+            m_fSignal(false)
+        {
+        }
+
+        MaybeQuitEvent(bool fSignal) :
+            m_fSignal(fSignal)
+        {
+        }
+
+    private:
         /* called on the main thread */
         void *handler()
@@ -234 +246 @@
             if (count == 0)
             {
-                if (gAutoShutdown)
+                if (gAutoShutdown || m_fSignal)
                 {
                     Assert(sInstance == NULL);
@@ -257 +269 @@
             return NULL;
         }
+
+        bool m_fSignal;
     };
 
@@ -272 +286 @@
 
         /* post a quit event to the main queue */
-        MaybeQuitEvent *ev = new MaybeQuitEvent();
+        MaybeQuitEvent *ev = new MaybeQuitEvent(false /* fSignal */);
         if (!q->postEvent(ev))
             delete ev;
@@ -516 +530 @@
             if (gAllowSigUsrQuit)
             {
-                VirtualBoxClassFactory::MaybeQuitEvent *ev = new VirtualBoxClassFactory::MaybeQuitEvent();
+                /* terminate the server process if it is idle */
+                VirtualBoxClassFactory::MaybeQuitEvent *ev = new VirtualBoxClassFactory::MaybeQuitEvent(true /* fSignal */);
                 if (!q->postEvent(ev))
                     delete ev;