Changeset 52413 in vbox for trunk/src/libs/xpcom18a4/ipc/ipcd

Timestamp:

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

Author:

vboxsync

Message:

VBoxSVC: resolve undesirable freeze on shutdown.

File:

• trunk/src/libs/xpcom18a4/ipc/ipcd/extensions/dconnect/src/ipcDConnectService.cpp (modified) (2 diffs)

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);