From d81c48392888bcc62ed8628ee3005a34d151ea96 Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Mon, 23 Jun 2014 21:30:15 +0000 Subject: Temporarily roll back the parts of r211241 where I fixed a mistake in the lock acquistion in HistoryUnwind and HistoryThread. We've got a deadlock with one use case of HistoryUnwind; I need to figure out what lock ordering is causing this and fix it for real. llvm-svn: 211541 --- lldb/source/Plugins/Process/Utility/HistoryThread.cpp | 2 +- lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/source/Plugins/Process/Utility/HistoryThread.cpp b/lldb/source/Plugins/Process/Utility/HistoryThread.cpp index cdb0528394c..590bb0162c8 100644 --- a/lldb/source/Plugins/Process/Utility/HistoryThread.cpp +++ b/lldb/source/Plugins/Process/Utility/HistoryThread.cpp @@ -78,7 +78,7 @@ HistoryThread::CreateRegisterContextForFrame (StackFrame *frame) lldb::StackFrameListSP HistoryThread::GetStackFrameList () { - Mutex::Locker locker(m_framelist_mutex); + Mutex::Locker (m_framelist_mutex); // FIXME do not throw away the lock after we acquire it.. if (m_framelist.get() == NULL) { m_framelist.reset (new StackFrameList (*this, StackFrameListSP(), true)); diff --git a/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp b/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp index bf8b3f5fb6c..f809ebedcfc 100644 --- a/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp +++ b/lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp @@ -66,7 +66,7 @@ HistoryUnwind::DoCreateRegisterContextForFrame (StackFrame *frame) bool HistoryUnwind::DoGetFrameInfoAtIndex (uint32_t frame_idx, lldb::addr_t& cfa, lldb::addr_t& pc) { - Mutex::Locker locker(m_unwind_mutex); + Mutex::Locker (m_unwind_mutex); // FIXME do not throw away the lock after we acquire it.. if (frame_idx < m_pcs.size()) { cfa = frame_idx; -- cgit v1.2.1