Changeset 30377 in vbox for trunk/src/VBox/Main/DHCPServerImpl.cpp

Timestamp:

Jun 22, 2010 2:01:01 PM (15 years ago)

Author:

vboxsync

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

62978

Message:

Main: do not hold any other lock while calling VirtualBox::saveSettings (mostly comments, only real change is in DHCPServer); also, VirtualBox lock is not needed in SessionMachine::endSavingState

File:

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

trunk/src/VBox/Main/DHCPServerImpl.cpp

@@ -150 +150 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock(mVirtualBox, this COMMA_LOCKVAL_SRC_POS);
-
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     m.enabled = aEnabled;
 
+    // save the global settings; for that we should hold only the VirtualBox lock
+    alock.release();
+    AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
     HRESULT rc = mVirtualBox->saveSettings();
 
@@ -218 +219 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock(mVirtualBox, this COMMA_LOCKVAL_SRC_POS);
-
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     m.IPAddress = aIPAddress;
     m.networkMask = aNetworkMask;
@@ -226 +225 @@
     m.upperIP = aUpperIP;
 
+    // save the global settings; for that we should hold only the VirtualBox lock
+    alock.release();
+    AutoWriteLock vboxLock(mVirtualBox COMMA_LOCKVAL_SRC_POS);
     return mVirtualBox->saveSettings();
 }