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

Timestamp:

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

Author:

vboxsync

Message:

Main: Implemented true AutoReaderLock (#2768).

File:

• trunk/src/VBox/Main/ParallelPortImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/ParallelPortImpl.cpp

@@ -163 +163 @@
  *  Loads settings from the given port node.
  *  May be called once right after this object creation.
- * 
+ *
  *  @param aPortNode <Port> node.
- * 
+ *
  *  @note Locks this object for writing.
  */
@@ -188 +188 @@
      * place when a setting of a newly created object must default to A while
      * the same setting of an object loaded from the old settings file must
-     * default to B. */ 
+     * default to B. */
 
     /* enabled (required) */
@@ -206 +206 @@
 }
 
-/** 
+/**
  *  Saves settings to the given port node.
- * 
+ *
  *  Note that the given Port node is comletely empty on input.
  *
  *  @param aPortNode <Port> node.
- * 
- *  @note Locks this object for reading. 
+ *
+ *  @note Locks this object for reading.
  */
 HRESULT ParallelPort::saveSettings (settings::Key &aPortNode)
@@ -272 +272 @@
 
     /* sanity too */
-    AutoCaller thatCaller (mPeer);
-    AssertComRCReturnVoid (thatCaller.rc());
-
-    /* lock both for writing since we modify both */
-    AutoMultiLock <2> alock (this->wlock(), AutoLock::maybeWlock (mPeer));
+    AutoCaller peerCaller (mPeer);
+    AssertComRCReturnVoid (peerCaller.rc());
+
+    /* lock both for writing since we modify both (mPeer is "master" so locked
+     * first) */
+    AutoMultiWriteLock2 alock (mPeer, this);
 
     if (mData.isBackedUp())
@@ -302 +303 @@
 
     /* sanity too */
-    AutoCaller thatCaller (mPeer);
+    AutoCaller thatCaller (aThat);
     AssertComRCReturnVoid (thatCaller.rc());
 
-    /* peer is not modified, lock it for reading */
-    AutoMultiLock <2> alock (this->wlock(), aThat->rlock());
+    /* peer is not modified, lock it for reading (aThat is "master" so locked
+     * first) */
+    AutoMultiLock2 alock (aThat->rlock(), this->wlock());
 
     /* this will back up current data */
@@ -504 +506 @@
 }
 
-/** 
+/**
  *  Validates COMSETTER(Path) arguments.
  */