Changeset 31872 in vbox for trunk/src/VBox/Main/xpcom

Timestamp:

Aug 23, 2010 4:07:41 PM (15 years ago)

Author:

vboxsync

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

65080

Message:

xpcom: SIGUSR1 will quit the server immediately if there are no open references

File:

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

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

@@ -210 +210 @@
 static bool gAutoShutdown = false;
 
-static nsIEventQueue  *gEventQ      = nsnull;
-static PRBool volatile gKeepRunning = PR_TRUE;
+static nsIEventQueue  *gEventQ          = nsnull;
+static PRBool volatile gKeepRunning     = PR_TRUE;
+static PRBool volatile gAllowSigUsrQuit = PR_TRUE;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -335 +336 @@
                 Assert(onMainThread);
             }
+
+            gAllowSigUsrQuit = PR_TRUE;
 
             if (!timerStarted)
@@ -533 +536 @@
                     /* On success, make sure the previous timer is stopped to
                      * cancel a scheduled server termination (if any). */
+                    gAllowSigUsrQuit = PR_FALSE;
                     RTTimerLRStop(sTimer);
                 }
@@ -552 +556 @@
 
                 /* make sure the previous timer is stopped */
+                gAllowSigUsrQuit = PR_FALSE;
                 RTTimerLRStop(sTimer);
             }
@@ -729 +734 @@
 };
 
-static void signal_handler(int /* sig */)
+static void signal_handler(int sig)
 {
     if (gEventQ && gKeepRunning)
     {
-        /* post a quit event to the queue */
-        ForceQuitEvent *ev = new ForceQuitEvent();
-        ev->postTo(gEventQ);
+        if (sig == SIGUSR1)
+        {
+            if (gAllowSigUsrQuit)
+            {
+                VirtualBoxClassFactory::MaybeQuitEvent *ev = new VirtualBoxClassFactory::MaybeQuitEvent();
+                ev->postTo(gEventQ);
+            }
+            /* else do nothing */
+        }
+        else
+        {
+            /* post a force quit event to the queue */
+            ForceQuitEvent *ev = new ForceQuitEvent();
+            ev->postTo(gEventQ);
+        }
     }
 }
@@ -1030 +1047 @@
             sigaction(SIGTERM, &sa, NULL);
             sigaction(SIGTRAP, &sa, NULL);
+            sigaction(SIGUSR1, &sa, NULL);
         }