Changeset 14665 in vbox

Timestamp:

Nov 26, 2008 10:50:00 PM (16 years ago)

Author:

vboxsync

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

39975

Message:

Main: Locking and sanity.

Location:

trunk/src/VBox/Main

Files:

• BIOSSettingsImpl.cpp (modified) (4 diffs)
• NetworkAdapterImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/BIOSSettingsImpl.cpp

@@ -710 +710 @@
 void BIOSSettings::commit()
 {
-    AutoWriteLock alock (this);
+    /* sanity */
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    /* sanity too */
+    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())
     {
@@ -716 +727 @@
         if (mPeer)
         {
-            // attach new data to the peer and re-share it
+            /* attach new data to the peer and reshare it */
             AutoWriteLock peerlock (mPeer);
             mPeer->mData.attach (mData);
@@ -725 +736 @@
 void BIOSSettings::copyFrom (BIOSSettings *aThat)
 {
-    AutoWriteLock alock (this);
-
-    // this will back up current data
+    AssertReturnVoid (aThat != NULL);
+
+    /* sanity */
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    /* sanity too */
+    AutoCaller thatCaller (aThat);
+    AssertComRCReturnVoid (thatCaller.rc());
+
+    /* 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 */
     mData.assignCopy (aThat->mData);
 }
@@ -733 +756 @@
 void BIOSSettings::applyDefaults (GuestOSType *aOsType)
 {
-    if (!aOsType)
-        return;
+    AssertReturnVoid (aOsType != NULL);
+
+    /* sanity */
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    AutoWriteLock alock (this);
 
     /* Initialize default BIOS settings here */

trunk/src/VBox/Main/NetworkAdapterImpl.cpp

@@ -1302 +1302 @@
 void NetworkAdapter::applyDefaults (GuestOSType *aOsType)
 {
-    if (!aOsType)
-        return;
+    AssertReturnVoid (aOsType != NULL);
+
+    /* sanity */
+    AutoCaller autoCaller (this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    AutoWriteLock alock (this);
 
     bool e1000enabled = false;
 #ifdef VBOX_WITH_E1000
-    e1000enabled = true;   
+    e1000enabled = true;
 #endif // VBOX_WITH_E1000