Changeset 25310 in vbox for trunk/src/VBox/Main/SystemPropertiesImpl.cpp

Timestamp:

Dec 10, 2009 5:06:44 PM (15 years ago)

Author:

vboxsync

Message:

Main: lock validator, first batch: implement per-thread stack to trace locking (disabled by default, use VBOX_WITH_LOCK_VALIDATOR, but that WILL FAIL presently)

File:

• trunk/src/VBox/Main/SystemPropertiesImpl.cpp (modified) (17 diffs)

trunk/src/VBox/Main/SystemPropertiesImpl.cpp

@@ -543 +543 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     m_strDefaultMachineFolderFull.cloneTo(aDefaultMachineFolder);
@@ -556 +556 @@
 
     /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this COMMA_LOCKVAL_SRC_POS);
 
     HRESULT rc = setDefaultMachineFolder (aDefaultMachineFolder);
@@ -572 +572 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     m_strDefaultHardDiskFolderFull.cloneTo(aDefaultHardDiskFolder);
@@ -585 +585 @@
 
     /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this COMMA_LOCKVAL_SRC_POS);
 
     HRESULT rc = setDefaultHardDiskFolder (aDefaultHardDiskFolder);
@@ -603 +603 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     SafeIfaceArray<IMediumFormat> mediumFormats (mMediumFormats);
@@ -618 +618 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     m_strDefaultHardDiskFormat.cloneTo(aDefaultHardDiskFormat);
@@ -631 +631 @@
 
     /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this COMMA_LOCKVAL_SRC_POS);
 
     HRESULT rc = setDefaultHardDiskFormat (aDefaultHardDiskFormat);
@@ -647 +647 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     m_strRemoteDisplayAuthLibrary.cloneTo(aRemoteDisplayAuthLibrary);
@@ -660 +660 @@
 
     /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this COMMA_LOCKVAL_SRC_POS);
 
     HRESULT rc = setRemoteDisplayAuthLibrary (aRemoteDisplayAuthLibrary);
@@ -676 +676 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     m_strWebServiceAuthLibrary.cloneTo(aWebServiceAuthLibrary);
@@ -689 +689 @@
 
     /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this COMMA_LOCKVAL_SRC_POS);
 
     HRESULT rc = setWebServiceAuthLibrary (aWebServiceAuthLibrary);
@@ -706 +706 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     *count = mLogHistoryCount;
@@ -719 +719 @@
 
     /* VirtualBox::saveSettings() needs a write lock */
-    AutoMultiWriteLock2 alock (mParent, this);
+    AutoMultiWriteLock2 alock(mParent, this COMMA_LOCKVAL_SRC_POS);
 
     mLogHistoryCount = count;
@@ -736 +736 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     *aAudioDriver = mDefaultAudioDriver;
@@ -751 +751 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this);
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     HRESULT rc = S_OK;
@@ -780 +780 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     data.strDefaultMachineFolder = m_strDefaultMachineFolder;
@@ -807 +807 @@
     AssertComRCReturn (autoCaller.rc(), format);
 
-    AutoReadLock alock(this);
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     for (MediumFormatList::const_iterator it = mMediumFormats.begin();