Changeset 3127 in vbox

Timestamp:

Jun 15, 2007 5:48:21 PM (17 years ago)

Author:

vboxsync

Message:

Main: Fixed: Avoid IPC dead-locks when calling Console::captureUSBDevices() and Console::releaseAllUSBDevices().

File:

• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6256 +6256 @@
     if (VBOX_SUCCESS (vrc))
     {
+        /* leave the lock before calling Host in VBoxSVC since Host may call
+         * us back from under its lock (e.g. onUSBDeviceAttach()) which would
+         * produce an inter-process dead-lock otherwise. */
+        AutoLock alock (this);
+        alock.leave();
+
         HRESULT hrc = mControl->AutoCaptureUSBDevices();
         ComAssertComRCRetRC (hrc);
@@ -6282 +6288 @@
     AssertReturnVoid (isLockedOnCurrentThread());
 
+    mUSBDevices.clear();
+
+    /* leave the lock before calling Host in VBoxSVC since Host may call
+     * us back from under its lock (e.g. onUSBDeviceAttach()) which would
+     * produce an inter-process dead-lock otherwise. */
+    AutoLock alock (this);
+    alock.leave();
+
     mControl->ReleaseAllUSBDevices();
-    mUSBDevices.clear();
 }