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

Prevent ProcessGDBRemote from launching local debug server in case of remote debug server connection failure. 

http://reviews.llvm.org/D14895

llvm-svn: 253906
This commit is contained in:
Oleksiy Vyalov 2015-11-23 19:32:24 +00:00
parent aa0a4bd05b
commit afd6ce4d29
2 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -989,12 +989,7 @@ ProcessGDBRemote::DoLaunch (Module *exe_module, ProcessLaunchInfo &launch_info)
ObjectFile * object_file = exe_module->GetObjectFile(); ObjectFile * object_file = exe_module->GetObjectFile();
if (object_file) if (object_file)
{ {
// Make sure we aren't already connected? error = EstablishConnectionIfNeeded (launch_info);
if (!m_gdb_comm.IsConnected())
{
error = LaunchAndConnectToDebugserver (launch_info);
}
if (error.Success()) if (error.Success())
{ {
lldb_utility::PseudoTerminal pty; lldb_utility::PseudoTerminal pty;
@ -1374,21 +1369,7 @@ ProcessGDBRemote::DoAttachToProcessWithID (lldb::pid_t attach_pid, const Process
Clear(); Clear();
if (attach_pid != LLDB_INVALID_PROCESS_ID) if (attach_pid != LLDB_INVALID_PROCESS_ID)
{ {
// Make sure we aren't already connected? error = EstablishConnectionIfNeeded (attach_info);
if (!m_gdb_comm.IsConnected())
{
error = LaunchAndConnectToDebugserver (attach_info);
if (error.Fail())
{
const char *error_string = error.AsCString();
if (error_string == NULL)
error_string = "unable to launch " DEBUGSERVER_BASENAME;
SetExitStatus (-1, error_string);
}
}
if (error.Success()) if (error.Success())
{ {
m_gdb_comm.SetDetachOnError(attach_info.GetDetachOnError()); m_gdb_comm.SetDetachOnError(attach_info.GetDetachOnError());
@ -1398,6 +1379,8 @@ ProcessGDBRemote::DoAttachToProcessWithID (lldb::pid_t attach_pid, const Process
SetID (attach_pid); SetID (attach_pid);
m_async_broadcaster.BroadcastEvent (eBroadcastBitAsyncContinue, new EventDataBytes (packet, packet_len)); m_async_broadcaster.BroadcastEvent (eBroadcastBitAsyncContinue, new EventDataBytes (packet, packet_len));
} }
else
SetExitStatus (-1, error.AsCString());
} }
return error; return error;
@ -1412,21 +1395,7 @@ ProcessGDBRemote::DoAttachToProcessWithName (const char *process_name, const Pro
if (process_name && process_name[0]) if (process_name && process_name[0])
{ {
// Make sure we aren't already connected? error = EstablishConnectionIfNeeded (attach_info);
if (!m_gdb_comm.IsConnected())
{
error = LaunchAndConnectToDebugserver (attach_info);
if (error.Fail())
{
const char *error_string = error.AsCString();
if (error_string == NULL)
error_string = "unable to launch " DEBUGSERVER_BASENAME;
SetExitStatus (-1, error_string);
}
}
if (error.Success()) if (error.Success())
{ {
StreamString packet; StreamString packet;
@ -1455,6 +1424,8 @@ ProcessGDBRemote::DoAttachToProcessWithName (const char *process_name, const Pro
m_async_broadcaster.BroadcastEvent (eBroadcastBitAsyncContinue, new EventDataBytes (packet.GetData(), packet.GetSize())); m_async_broadcaster.BroadcastEvent (eBroadcastBitAsyncContinue, new EventDataBytes (packet.GetData(), packet.GetSize()));
} }
else
SetExitStatus (-1, error.AsCString());
} }
return error; return error;
} }
@ -3541,6 +3512,27 @@ ProcessGDBRemote::DoSignal (int signo)
return error; return error;
} }
Error
ProcessGDBRemote::EstablishConnectionIfNeeded (const ProcessInfo &process_info)
{
// Make sure we aren't already connected?
if (m_gdb_comm.IsConnected())
return Error();
PlatformSP platform_sp (GetTarget ().GetPlatform ());
if (platform_sp && !platform_sp->IsHost ())
return Error("Lost debug server connection");
auto error = LaunchAndConnectToDebugserver (process_info);
if (error.Fail())
{
const char *error_string = error.AsCString();
if (error_string == nullptr)
error_string = "unable to launch " DEBUGSERVER_BASENAME;
}
return error;
}
Error Error
ProcessGDBRemote::LaunchAndConnectToDebugserver (const ProcessInfo &process_info) ProcessGDBRemote::LaunchAndConnectToDebugserver (const ProcessInfo &process_info)
{ {

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

@ -353,6 +353,9 @@ protected:
UpdateThreadList (ThreadList &old_thread_list, UpdateThreadList (ThreadList &old_thread_list,
ThreadList &new_thread_list) override; ThreadList &new_thread_list) override;
Error
EstablishConnectionIfNeeded (const ProcessInfo &process_info);
Error Error
LaunchAndConnectToDebugserver (const ProcessInfo &process_info); LaunchAndConnectToDebugserver (const ProcessInfo &process_info);