Changeset 7992 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Apr 15, 2008 1:53:12 PM (17 years ago)

Author:

vboxsync

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

29646

Message:

Main: Implemented true AutoReaderLock (#2768).

File:

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2491 +2491 @@
 
 /**
- *  Called by IInternalSessionControl::OnDVDDriveChange().
- *
- *  @note Locks this object for reading.
+ * Called by IInternalSessionControl::OnDVDDriveChange().
+ *
+ * @note Locks this object for writing.
  */
 HRESULT Console::onDVDDriveChange()
@@ -2502 +2502 @@
     AssertComRCReturnRC (autoCaller.rc());
 
-    AutoReaderLock alock (this);
+    /* doDriveChange() needs a write lock */
+    AutoLock alock (this);
 
     /* Ignore callbacks when there's no VM around */
@@ -2587 +2588 @@
 
 /**
- *  Called by IInternalSessionControl::OnFloppyDriveChange().
- *
- *  @note Locks this object for reading.
+ * Called by IInternalSessionControl::OnFloppyDriveChange().
+ *
+ * @note Locks this object for writing.
  */
 HRESULT Console::onFloppyDriveChange()
@@ -2598 +2599 @@
     AssertComRCReturnRC (autoCaller.rc());
 
-    AutoReaderLock alock (this);
+    /* doDriveChange() needs a write lock */
+    AutoLock alock (this);
 
     /* Ignore callbacks when there's no VM around */
@@ -2704 +2706 @@
  * @param   fPassthrough    Enables using passthrough mode of the host DVD drive if applicable.
  *
- * @note Locks this object for reading.
+ * @note Locks this object for writing.
  */
 HRESULT Console::doDriveChange (const char *pszDevice, unsigned uInstance, unsigned uLun, DriveState_T eState,
@@ -2717 +2719 @@
     AssertComRCReturnRC (autoCaller.rc());
 
-    AutoReaderLock alock (this);
+    /* We will need to release the write lock before calling EMT */
+    AutoLock alock (this);
 
     /* protect mpVM */
@@ -2784 +2787 @@
  *
  * @thread  EMT
- * @note Locks the Console object for writing
+ * @note Locks the Console object for writing.
  */
 DECLCALLBACK(int) Console::changeDrive (Console *pThis, const char *pszDevice, unsigned uInstance, unsigned uLun,
@@ -2805 +2808 @@
 
     /*
-     *  Locking the object before doing VMR3* calls is quite safe here,
-     *  since we're on EMT. Write lock is necessary because we're indirectly
-     *  modify the meDVDState/meFloppyState members (pointed to by peState).
+     * Locking the object before doing VMR3* calls is quite safe here, since
+     * we're on EMT. Write lock is necessary because we indirectly modify the
+     * meDVDState/meFloppyState members (pointed to by peState).
      */
     AutoLock alock (pThis);