Changeset 8680 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

May 7, 2008 6:27:19 PM (17 years ago)

Author:

vboxsync

Message:

Assert on no-lock assumptions in onUSBDeviceAttach and onUSBDeviceDetach.

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8689 +8689 @@
 
 /**
- *  @note Locks this object for reading.
+ *  @note The calls shall hold no locks. Will temporarily lock this object for reading.
  */
 HRESULT SessionMachine::onUSBDeviceAttach (IUSBDevice *aDevice,
@@ -8714 +8714 @@
         return E_FAIL;
 
+    /* No locks should be held at this point. */
+    AssertMsg (RTThreadGetWriteLockCount (RTThreadSelf()) == 0, ("%d\n", RTThreadGetWriteLockCount (RTThreadSelf())));
+    AssertMsg (RTThreadGetReadLockCount (RTThreadSelf()) == 0, ("%d\n", RTThreadGetReadLockCount (RTThreadSelf())));
+
     return directControl->OnUSBDeviceAttach (aDevice, aError, aMaskedIfs);
 }
 
 /**
- *  @note Locks this object for reading.
+ *  @note The calls shall hold no locks. Will temporarily lock this object for reading.
  */
 HRESULT SessionMachine::onUSBDeviceDetach (INPTR GUIDPARAM aId,
@@ -8741 +8745 @@
     if (!directControl)
         return E_FAIL;
+
+    /* No locks should be held at this point. */
+    AssertMsg (RTThreadGetWriteLockCount (RTThreadSelf()) == 0, ("%d\n", RTThreadGetWriteLockCount (RTThreadSelf())));
+    AssertMsg (RTThreadGetReadLockCount (RTThreadSelf()) == 0, ("%d\n", RTThreadGetReadLockCount (RTThreadSelf())));
 
     return directControl->OnUSBDeviceDetach (aId, aError);