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

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/solaris/USBProxyServiceSolaris.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/solaris/USBProxyServiceSolaris.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2005-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -54 +54 @@
  * Initialize data members.
  */
-USBProxyServiceSolaris::USBProxyServiceSolaris (Host *aHost)
-    : USBProxyService (aHost), mUSBLibInitialized(false)
+USBProxyServiceSolaris::USBProxyServiceSolaris(Host *aHost)
+    : USBProxyService(aHost), mUSBLibInitialized(false)
 {
     LogFlowThisFunc(("aHost=%p\n", aHost));
@@ -337 +337 @@
      */
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
     LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str()));
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
     Assert(aDevice->getUnistate() == kHostUSBDeviceState_Capturing);
     AssertReturn(aDevice->mUsb, VERR_INVALID_POINTER);
@@ -372 +375 @@
 void USBProxyServiceSolaris::captureDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess)
 {
+    AssertReturnVoid(aDevice->isWriteLockOnCurrentThread());
     /*
      * Remove the one-shot filter if necessary.
@@ -388 +392 @@
      */
     AssertReturn(aDevice, VERR_GENERAL_FAILURE);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
+    AutoReadLock devLock(aDevice COMMA_LOCKVAL_SRC_POS);
     LogFlowThisFunc(("aDevice=%s\n", aDevice->getName().c_str()));
-    AssertReturn(aDevice->isWriteLockOnCurrentThread(), VERR_GENERAL_FAILURE);
+
     Assert(aDevice->getUnistate() == kHostUSBDeviceState_ReleasingToHost);
     AssertReturn(aDevice->mUsb, VERR_INVALID_POINTER);
@@ -423 +430 @@
 void USBProxyServiceSolaris::releaseDeviceCompleted(HostUSBDevice *aDevice, bool aSuccess)
 {
+    AssertReturnVoid(aDevice->isWriteLockOnCurrentThread());
     /*
      * Remove the one-shot filter if necessary.
@@ -435 +443 @@
 bool USBProxyServiceSolaris::updateDeviceState(HostUSBDevice *aDevice, PUSBDEVICE aUSBDevice, bool *aRunFilters, SessionMachine **aIgnoreMachine)
 {
+    AssertReturn(aDevice, false);
+    AssertReturn(!aDevice->isWriteLockOnCurrentThread(), false)
     return USBProxyService::updateDeviceState(aDevice, aUSBDevice, aRunFilters, aIgnoreMachine);
 }