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

Handle old style S packet correctly 

SUMMARY:
    This patch fixes couple of issues:
    1. A thread tries to lock a mutex which is already locked.
    2. Updating a thread list before the stop packet is parsed so that it can get a valid thread id and allows to set the stop info correctly.
    
    Reviewers: clayborg
    Subscribers: mohit.bhakkad, sagar, jaydeep, lldb-commits
    Differential Revision: http://reviews.llvm.org/D11449

llvm-svn: 243091
This commit is contained in:
Bhushan D. Attarde 2015-07-24 04:06:20 +00:00
parent a68a78751f
commit 1e271df041
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
View File

@ -371,7 +371,7 @@ ProcessGDBRemote::ProcessGDBRemote(Target& target, Listener &listener) :
m_flags (0), m_flags (0),
m_gdb_comm (), m_gdb_comm (),
m_debugserver_pid (LLDB_INVALID_PROCESS_ID), m_debugserver_pid (LLDB_INVALID_PROCESS_ID),
m_last_stop_packet_mutex (Mutex::eMutexTypeNormal), m_last_stop_packet_mutex (Mutex::eMutexTypeRecursive),
m_register_info (), m_register_info (),
m_async_broadcaster (NULL, "lldb.process.gdb-remote.async-broadcaster"), m_async_broadcaster (NULL, "lldb.process.gdb-remote.async-broadcaster"),
m_async_thread_state_mutex(Mutex::eMutexTypeRecursive), m_async_thread_state_mutex(Mutex::eMutexTypeRecursive),
@ -2485,6 +2485,18 @@ ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
} }
} }
if (tid == LLDB_INVALID_THREAD_ID)
{
// A thread id may be invalid if the response is old style 'S' packet which does not provide the
// thread information. So update the thread list and choose the first one.
UpdateThreadIDList ();
if (!m_thread_ids.empty ())
{
tid = m_thread_ids.front ();
}
}
ThreadSP thread_sp = SetThreadStopInfo (tid, ThreadSP thread_sp = SetThreadStopInfo (tid,
expedited_register_map, expedited_register_map,
signo, signo,
@ -2499,19 +2511,6 @@ ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
queue_kind, queue_kind,
queue_serial); queue_serial);
// If the response is old style 'S' packet which does not provide us with thread information
// then update the thread list and choose the first one.
if (!thread_sp)
{
UpdateThreadIDList ();
if (!m_thread_ids.empty ())
{
Mutex::Locker locker (m_thread_list_real.GetMutex ());
thread_sp = m_thread_list_real.FindThreadByProtocolID (m_thread_ids.front (), false);
}
}
return eStateStopped; return eStateStopped;
} }
break; break;