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

Timestamp:

Apr 27, 2015 4:38:40 PM (10 years ago)

Author:

vboxsync

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

99805

Message:

Main/src-server/xpcom/server.cpp: make the event queue handling and the critsect destruction a bit more robust

File:

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

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

@@ -132 +132 @@
 static uint32_t gShutdownDelayMs = 5000;
 
-static nsIEventQueue  *gEventQ          = nsnull;
+static nsCOMPtr<nsIEventQueue> gEventQ  = nsnull;
 static PRBool volatile gKeepRunning     = PR_TRUE;
 static PRBool volatile gAllowSigUsrQuit = PR_TRUE;
@@ -232 +232 @@
 
             PRBool onMainThread = PR_TRUE;
-            if (gEventQ)
-                gEventQ->IsOnCurrentThread(&onMainThread);
+            nsCOMPtr<nsIEventQueue> q(gEventQ);
+            if (q)
+            {
+                q->IsOnCurrentThread(&onMainThread);
+                q = nsnull;
+            }
 
             PRBool timerStarted = PR_FALSE;
@@ -289 +293 @@
                      */
 
-                    Assert(gEventQ == NULL);
+                    Assert(!gEventQ);
                 }
             }
@@ -356 +360 @@
          * and this method was so lucky that it got a chance to run before
          * the timer was killed. */
-        AssertReturnVoid(gEventQ);
+        nsCOMPtr<nsIEventQueue> q(gEventQ);
+        AssertReturnVoid(q);
 
         /* post a quit event to the main queue */
         MaybeQuitEvent *ev = new MaybeQuitEvent();
-        nsresult rv = ev->postTo(gEventQ);
+        nsresult rv = ev->postTo(q);
         NOREF(rv);
 
@@ -392 +397 @@
         RTTimerLRDestroy(sTimer);
         sTimer = NULL;
-
-        RTCritSectDelete(&sLock);
 
         if (sInstance != NULL)
@@ -404 +407 @@
             sInstance->Release();
         }
+
+        /* Destroy lock after releasing the VirtualBox instance, otherwise
+         * there are races with cleanup. */
+        RTCritSectDelete(&sLock);
 
         return NS_OK;
@@ -594 +601 @@
 static void signal_handler(int sig)
 {
-    if (gEventQ && gKeepRunning)
+    nsCOMPtr<nsIEventQueue> q(gEventQ);
+    if (q && gKeepRunning)
     {
         if (sig == SIGUSR1)
@@ -601 +609 @@
             {
                 VirtualBoxClassFactory::MaybeQuitEvent *ev = new VirtualBoxClassFactory::MaybeQuitEvent();
-                ev->postTo(gEventQ);
+                ev->postTo(q);
             }
             /* else do nothing */
@@ -609 +617 @@
             /* post a force quit event to the queue */
             ForceQuitEvent *ev = new ForceQuitEvent();
-            ev->postTo(gEventQ);
+            ev->postTo(q);
         }
     }
@@ -863 +871 @@
          * gets created upon XPCOM startup, so it will use the main (this)
          * thread's event queue to receive IPC events) */
-        rc = NS_GetMainEventQ(&gEventQ);
+        rc = NS_GetMainEventQ(getter_AddRefs(gEventQ));
         if (NS_FAILED(rc))
         {
@@ -992 +1000 @@
 
     NS_IF_RELEASE(gIpcServ);
-    NS_IF_RELEASE(gEventQ);
+    gEventQ = nsnull;
 
     /* no nsCOMPtrs are allowed to be alive when you call com::Shutdown(). */