Changeset 41528 in vbox for trunk/src/VBox/Main/src-server/linux

Timestamp:

May 31, 2012 4:48:33 PM (13 years ago)

Author:

vboxsync

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

78291

Message:

Main/HostUSBDevice(all platforms)+USBProxyService: redo USB locking, fixes major regression, added lots of assertions to catch locking flaws early, whitespace cleanup
Main/Machine: small USB locking fix to be consistent with the remaining code
Main/Host+glue/AutoLock: replace USB list lock by host lock, small numbering cleanup
Main/Console: redo USB locking, do less in USB callbacks/EMT (addresses long standing todo items), eliminate unsafe iterator parameters

File:

• trunk/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp (modified) (9 diffs)

trunk/src/VBox/Main/src-server/linux/USBProxyServiceLinux.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2005-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -222 +222 @@
 int USBProxyServiceLinux::captureDevice(HostUSBDevice *aDevice)
 {
-    Log(("USBProxyServiceLinux::captureDevice: %p {%s}\n", aDevice, aDevice->getName().c_str()));
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
+    LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str()));
 
     /*
@@ -230 +232 @@
      */
     Assert(aDevice->getUnistate() == kHostUSBDeviceState_Capturing);
+    devLock.release();
     interruptWait();
 
@@ -238 +241 @@
 int USBProxyServiceLinux::releaseDevice(HostUSBDevice *aDevice)
 {
-    Log(("USBProxyServiceLinux::releaseDevice: %p\n", aDevice));
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
+    LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str()));
 
     /*
@@ -246 +251 @@
      */
     Assert(aDevice->getUnistate() == kHostUSBDeviceState_ReleasingToHost);
+    devLock.release();
     interruptWait();
 
@@ -254 +260 @@
 bool USBProxyServiceLinux::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine)
 {
+    AssertReturn(aDevice, false);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
     if (    aUSBDevice->enmState == USBDEVICESTATE_USED_BY_HOST_CAPTURABLE
         &&  aDevice->mUsb->enmState == USBDEVICESTATE_USED_BY_HOST)
         LogRel(("USBProxy: Device %04x:%04x (%s) has become accessible.\n",
                 aUSBDevice->idVendor, aUSBDevice->idProduct, aUSBDevice->pszAddress));
+    devLock.release();
     return updateDeviceStateFake(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
 }
@@ -269 +279 @@
 void USBProxyServiceLinux::deviceAdded(ComObjPtr<HostUSBDevice> &aDevice, SessionMachinesList &llOpenedMachines, PUSBDEVICE aUSBDevice)
 {
+    AssertReturnVoid(aDevice);
+    AssertReturnVoid(!aDevice->isWriteLockOnCurrentThread());
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
     if (aUSBDevice->enmState == USBDEVICESTATE_USED_BY_HOST)
     {
@@ -276 +289 @@
     }
 
+    devLock.release();
     USBProxyService::deviceAdded(aDevice, llOpenedMachines, aUSBDevice);
 }
@@ -349 +363 @@
 int USBProxyServiceLinux::interruptWait(void)
 {
+    AssertReturn(!isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 #ifdef VBOX_USB_WITH_SYSFS
     LogFlowFunc(("mUsingUsbfsDevices=%d\n", mUsingUsbfsDevices));