[Lldb-commits] [lldb] r113309 - /lldb/trunk/source/Core/UserSettingsController.cpp

[Jim Ingham]

Author: jingham
Date: Tue Sep  7 18:31:30 2010
New Revision: 113309

URL: http://llvm.org/viewvc/llvm-project?rev=113309&view=rev
Log:
The settings mutexes get used recursively, and deadlock if they are normal mutexes.

Modified:
    lldb/trunk/source/Core/UserSettingsController.cpp

Modified: lldb/trunk/source/Core/UserSettingsController.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/UserSettingsController.cpp?rev=113309&r1=113308&r2=113309&view=diff
==============================================================================
--- lldb/trunk/source/Core/UserSettingsController.cpp (original)
+++ lldb/trunk/source/Core/UserSettingsController.cpp Tue Sep  7 18:31:30 2010
@@ -26,8 +26,8 @@
     m_pending_settings (),
     m_live_settings (),
     m_children_mutex (Mutex::eMutexTypeNormal),
-    m_pending_settings_mutex (Mutex::eMutexTypeNormal),
-    m_live_settings_mutex (Mutex::eMutexTypeNormal)
+    m_pending_settings_mutex (Mutex::eMutexTypeRecursive),
+    m_live_settings_mutex (Mutex::eMutexTypeRecursive)
 {
     m_settings.parent = parent;
     m_settings.level_name.SetCString (level_name);