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

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/freebsd/USBProxyServiceFreeBSD.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/freebsd/USBProxyServiceFreeBSD.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2005-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -111 +111 @@
 int USBProxyServiceFreeBSD::captureDevice(HostUSBDevice *aDevice)
 {
-    Log(("USBProxyServiceFreeBSD::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()));
 
     /*
@@ -119 +121 @@
      */
     Assert(aDevice->getUnistate() == kHostUSBDeviceState_Capturing);
+    devLock.release();
     interruptWait();
 
@@ -127 +130 @@
 int USBProxyServiceFreeBSD::releaseDevice(HostUSBDevice *aDevice)
 {
-    Log(("USBProxyServiceFreeBSD::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()));
 
     /*
@@ -135 +140 @@
      */
     Assert(aDevice->getUnistate() == kHostUSBDeviceState_ReleasingToHost);
+    devLock.release();
     interruptWait();
 
@@ -143 +149 @@
 bool USBProxyServiceFreeBSD::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine)
 {
+    AssertReturn(aDevice, false);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false);
+
     return updateDeviceStateFake(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
 }
@@ -148 +157 @@
 
 /**
- * A device was added, we need to adjust mUdevPolls.
+ * A device was added
  *
  * See USBProxyService::deviceAdded for details.