maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix race during process detach 

Summary:
The code which was preventing the usage of the OS plugin while detach is in
progress also prevented us to update the thread list correctly. This resulted
in an empty thread list, which confused the detaching logic. Change the
condition do only do what it says (disable the usage of the OS plugin).

Reviewers: clayborg, jingham

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D14201

llvm-svn: 251932
This commit is contained in:
Pavel Labath 2015-11-03 16:05:18 +00:00
parent 53f8a53fb6
commit 862432c90e
2 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
View File

@ -20,7 +20,6 @@ class AttachResumeTestCase(TestBase):
@skipIfRemote @skipIfRemote
@expectedFailureFreeBSD('llvm.org/pr19310') @expectedFailureFreeBSD('llvm.org/pr19310')
@expectedFailureWindows("llvm.org/pr24778") @expectedFailureWindows("llvm.org/pr24778")
@expectedFlakeyLinux('llvm.org/pr19310')
def test_attach_continue_interrupt_detach(self): def test_attach_continue_interrupt_detach(self):
"""Test attach/continue/interrupt/detach""" """Test attach/continue/interrupt/detach"""
self.build() self.build()

5
lldb/source/Target/Process.cpp
View File

@ -1565,10 +1565,8 @@ Process::UpdateThreadListIfNeeded ()
// Don't call into the OperatingSystem to update the thread list if we are shutting down, since // Don't call into the OperatingSystem to update the thread list if we are shutting down, since
// that may call back into the SBAPI's, requiring the API lock which is already held by whoever is // that may call back into the SBAPI's, requiring the API lock which is already held by whoever is
// shutting us down, causing a deadlock. // shutting us down, causing a deadlock.
if (!m_destroy_in_process)
{
OperatingSystem *os = GetOperatingSystem (); OperatingSystem *os = GetOperatingSystem ();
if (os) if (os && !m_destroy_in_process)
{ {
// Clear any old backing threads where memory threads might have been // Clear any old backing threads where memory threads might have been
// backed by actual threads from the lldb_private::Process subclass // backed by actual threads from the lldb_private::Process subclass
@ -1600,7 +1598,6 @@ Process::UpdateThreadListIfNeeded ()
// No OS plug-in, the new thread list is the same as the real thread list // No OS plug-in, the new thread list is the same as the real thread list
new_thread_list = real_thread_list; new_thread_list = real_thread_list;
} }
}
m_thread_list_real.Update(real_thread_list); m_thread_list_real.Update(real_thread_list);
m_thread_list.Update (new_thread_list); m_thread_list.Update (new_thread_list);