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

Make sure we don't lose our stop reply packet in the case where the other 

GDB server doesn't support the LLDB specific qThreadStopInfo packet.

llvm-svn: 132499
This commit is contained in:
Greg Clayton 2011-06-02 22:22:38 +00:00
parent 8672996e4d
commit dd0e5a5258
2 changed files with 7 additions and 22 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

@ -391,10 +391,9 @@ ProcessGDBRemote::DoConnectRemote (const char *remote_url)
// We have a valid process
SetID (pid);
UpdateThreadListIfNeeded ();
StringExtractorGDBRemote response;
if (m_gdb_comm.SendPacketAndWaitForResponse("?", 1, response, false))
if (m_gdb_comm.SendPacketAndWaitForResponse("?", 1, m_last_stop_packet, false))
{
const StateType state = SetThreadStopInfo (response);
const StateType state = SetThreadStopInfo (m_last_stop_packet);
if (state == eStateStopped)
{
SetPrivateState (state);
@ -550,10 +549,9 @@ ProcessGDBRemote::DoLaunch
return error;
}
StringExtractorGDBRemote response;
if (m_gdb_comm.SendPacketAndWaitForResponse("?", 1, response, false))
if (m_gdb_comm.SendPacketAndWaitForResponse("?", 1, m_last_stop_packet, false))
{
SetPrivateState (SetThreadStopInfo (response));
SetPrivateState (SetThreadStopInfo (m_last_stop_packet));
if (!disable_stdio)
{
@ -1097,6 +1095,7 @@ ProcessGDBRemote::UpdateThreadListIfNeeded ()
StateType
ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
{
stop_packet.SetFilePos (0);
const char stop_type = stop_packet.GetChar();
switch (stop_type)
{
@ -1245,22 +1244,10 @@ ProcessGDBRemote::SetThreadStopInfo (StringExtractor& stop_packet)
void
ProcessGDBRemote::RefreshStateAfterStop ()
{
// FIXME - add a variable to tell that we're in the middle of attaching if we
// need to know that.
// We must be attaching if we don't already have a valid architecture
// if (!GetTarget().GetArchitecture().IsValid())
// {
// Module *exe_module = GetTarget().GetExecutableModule().get();
// if (exe_module)
// m_arch_spec = exe_module->GetArchitecture();
// }
// Let all threads recover from stopping and do any clean up based
// on the previous thread state (if any).
m_thread_list.RefreshStateAfterStop();
// Discover new threads:
UpdateThreadListIfNeeded ();
SetThreadStopInfo (m_last_stop_packet);
}
Error
@ -2342,13 +2329,11 @@ ProcessGDBRemote::AsyncThread (void *arg)
case eStateCrashed:
case eStateSuspended:
process->m_last_stop_packet = response;
process->m_last_stop_packet.SetFilePos (0);
process->SetPrivateState (stop_state);
break;
case eStateExited:
process->m_last_stop_packet = response;
process->m_last_stop_packet.SetFilePos (0);
response.SetFilePos(1);
process->SetExitStatus(response.GetHexU8(), NULL);
done = true;

2
lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.h
View File

@ -297,7 +297,7 @@ protected:
GDBRemoteCommunicationClient m_gdb_comm;
lldb::pid_t m_debugserver_pid;
lldb::thread_t m_debugserver_thread;
StringExtractor m_last_stop_packet;
StringExtractorGDBRemote m_last_stop_packet;
GDBRemoteDynamicRegisterInfo m_register_info;
lldb_private::Broadcaster m_async_broadcaster;
lldb::thread_t m_async_thread;