<rdar://problem/11202426>
Work around a deadlocking issue where "SBDebugger::MemoryPressureDetected ()" is being called and is causing a deadlock. We now just try and get the lock when trying to trim down the unique modules so we don't deadlock debugger GUI programs until we can find the root cause.
llvm-svn: 154339
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp
index 8ef4430..8932576 100644
--- a/lldb/source/Core/Module.cpp
+++ b/lldb/source/Core/Module.cpp
@@ -86,7 +86,8 @@
void
ClearModuleInfo (void)
{
- ModuleList::RemoveOrphanSharedModules();
+ const bool mandatory = true;
+ ModuleList::RemoveOrphanSharedModules(mandatory);
}
void
diff --git a/lldb/source/Core/ModuleList.cpp b/lldb/source/Core/ModuleList.cpp
index 69245fb..5e4f660 100644
--- a/lldb/source/Core/ModuleList.cpp
+++ b/lldb/source/Core/ModuleList.cpp
@@ -112,9 +112,20 @@
size_t
-ModuleList::RemoveOrphans ()
+ModuleList::RemoveOrphans (bool mandatory)
{
- Mutex::Locker locker(m_modules_mutex);
+ Mutex::Locker locker;
+
+ if (mandatory)
+ {
+ locker.Reset (m_modules_mutex.GetMutex());
+ }
+ else
+ {
+ // Not mandatory, remove orphans if we can get the mutex
+ if (!locker.TryLock(m_modules_mutex.GetMutex()))
+ return 0;
+ }
collection::iterator pos = m_modules.begin();
size_t remove_count = 0;
while (pos != m_modules.end())
@@ -587,9 +598,9 @@
}
uint32_t
-ModuleList::RemoveOrphanSharedModules ()
+ModuleList::RemoveOrphanSharedModules (bool mandatory)
{
- return GetSharedModuleList ().RemoveOrphans();
+ return GetSharedModuleList ().RemoveOrphans(mandatory);
}
Error