diff options
| author | Jim Ingham <jingham@apple.com> | 2010-09-07 23:31:30 +0000 |
|---|---|---|
| committer | Jim Ingham <jingham@apple.com> | 2010-09-07 23:31:30 +0000 |
| commit | a767c9a3aeb4a2844a1af3ba6bd9d1242dfc2524 (patch) | |
| tree | 9614a57f45a66f127574ec8ba6ba148cb876d4cf /lldb/source/Core/UserSettingsController.cpp | |
| parent | 366a94822bf210cbb5d32a76b63e8423268565db (diff) | |
| download | bcm5719-llvm-a767c9a3aeb4a2844a1af3ba6bd9d1242dfc2524.tar.gz bcm5719-llvm-a767c9a3aeb4a2844a1af3ba6bd9d1242dfc2524.zip | |
The settings mutexes get used recursively, and deadlock if they are normal mutexes.
llvm-svn: 113309
Diffstat (limited to 'lldb/source/Core/UserSettingsController.cpp')
| -rw-r--r-- | lldb/source/Core/UserSettingsController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp index 9f1a5d09c99..ea61e863508 100644 --- a/lldb/source/Core/UserSettingsController.cpp +++ b/lldb/source/Core/UserSettingsController.cpp @@ -26,8 +26,8 @@ UserSettingsController::UserSettingsController (const char *level_name, 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); |
