replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modified patch from Matt Kopec that makes sure the run lock is acquired when attaching and makes sure the pid is being set on linux in the process info. 

llvm-svn: 165804
This commit is contained in:
Greg Clayton 2012-10-12 16:10:12 +00:00
parent 4d88f05fe0
commit 926cce7619
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/source/Plugins/Process/Linux/ProcessMonitor.cpp
View File

@ -1193,6 +1193,8 @@ ProcessMonitor::Attach(AttachArgs *args)
goto FINISH;
}
monitor->m_pid = pid;
// Update the process thread list with the attached thread.
inferior.reset(new POSIXThread(processSP, pid));
if (log)

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

@ -2750,10 +2750,19 @@ Process::Attach (ProcessAttachInfo &attach_info)
error = WillAttachToProcessWithName(process_name, wait_for_launch);
if (error.Success())
{
m_should_detach = true;
if (m_run_lock.WriteTryLock())
{
m_should_detach = true;
SetPublicState (eStateAttaching);
// Now attach using these arguments.
error = DoAttachToProcessWithName (process_name, wait_for_launch, attach_info);
}
else
{
// This shouldn't happen
error.SetErrorString("failed to acquire process run lock");
}
SetPublicState (eStateAttaching);
error = DoAttachToProcessWithName (process_name, wait_for_launch, attach_info);
if (error.Fail())
{
if (GetID() != LLDB_INVALID_PROCESS_ID)
@ -2817,10 +2826,20 @@ Process::Attach (ProcessAttachInfo &attach_info)
error = WillAttachToProcessWithID(attach_pid);
if (error.Success())
{
m_should_detach = true;
SetPublicState (eStateAttaching);
error = DoAttachToProcessWithID (attach_pid, attach_info);
if (m_run_lock.WriteTryLock())
{
// Now attach using these arguments.
m_should_detach = true;
SetPublicState (eStateAttaching);
error = DoAttachToProcessWithID (attach_pid, attach_info);
}
else
{
// This shouldn't happen
error.SetErrorString("failed to acquire process run lock");
}
if (error.Success())
{