Changeset 52413 in vbox for trunk/src

Timestamp:

Aug 19, 2014 12:48:42 PM (11 years ago)

Author:

vboxsync

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

95585

Message:

VBoxSVC: resolve undesirable freeze on shutdown.

Location:

trunk/src

Files:

• VBox/Main/src-all/EventImpl.cpp (modified) (4 diffs)
• libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-all/EventImpl.cpp

@@ -579 +579 @@
 
     RTSEMEVENT                    mQEvent;
+    int32_t volatile              mWaitCnt;
     RTCRITSECT                    mcsQLock;
     PassiveQueue                  mQueue;
@@ -725 +726 @@
                                BOOL aActive,
                                EventSource *aOwner) :
-    mActive(aActive), mOwner(aOwner), mRefCnt(0)
+    mActive(aActive), mOwner(aOwner), mWaitCnt(0), mRefCnt(0)
 {
     mListener = aListener;
@@ -882 +883 @@
         // release lock while waiting, listener will not go away due to above holder
         aAlock.release();
+
+        // In order to safely shutdown, count all waiting threads here.
+        ASMAtomicIncS32(&mWaitCnt);
         ::RTSemEventWait(mQEvent, aTimeout);
+        ASMAtomicDecS32(&mWaitCnt);
+
         // reacquire lock
         aAlock.acquire();
@@ -918 +924 @@
         RTSEMEVENT tmp = mQEvent;
         mQEvent = NIL_RTSEMEVENT;
+
+        /* On Darwin it is known that RTSemEventDestroy() returns 0 while
+         * corresponding thread remains to be blocked after that. In order to prevent
+         * undesireble freeze on shutdown, this workaround is used. */
+        Log(("Wait for %d waiters to release.\n", ASMAtomicReadS32(&mWaitCnt)));
+        while (ASMAtomicReadS32(&mWaitCnt) > 0)
+        {
+            ::RTSemEventSignal(tmp);
+
+            /* Are we already done? */
+            if (ASMAtomicReadS32(&mWaitCnt) == 0)
+                break;
+
+            RTThreadSleep(10);
+        }
+        Log(("All waiters just released the lock.\n"));
+
         ::RTSemEventDestroy(tmp);
     }

trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp

@@ -3229 +3229 @@
     }
 
+    /* Double-ckeck if we already allowed to quit. */
+    if ((tsStart + VBOX_XPCOM_SHUTDOWN_TIMEOUT_MS ) < RTTimeMilliTS() || mWorkers.Count() == 0)
+        break;
+
     // Relax a bit before the next round.
     RTThreadSleep(10);
@@ -3235 +3239 @@
   LOG(("There are %d thread(s) left.\n", mWorkers.Count()));
 
-  // If there are some running threads left, just forget about them.
-  mWorkers.Clear();
+  // If there are some running threads left, terminate the process.
+  if (mWorkers.Count() > 0)
+    exit(1);
+
 
   nsAutoMonitor::DestroyMonitor(mWaitingWorkersMon);