Author: jmolenda
Date: Thu Nov 5 17:54:29 2015
New Revision: 252242
URL: http://llvm.org/viewvc/llvm-project?rev=252242&view=rev
Log:
Use Process::IsAlive instead of just checking for eStateExited.
Two minor tweaks to GetLoadedDynamicLibrariesInfos.
Modified:
lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=252242&r1=252241&r2=252242&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Thu Nov
5 17:54:29 2015
@@ -2981,7 +2981,7 @@ ProcessGDBRemote::SetUnixSignals(const U
bool
ProcessGDBRemote::IsAlive ()
{
- return m_gdb_comm.IsConnected() && m_private_state.GetValue() !=
eStateExited;
+ return m_gdb_comm.IsConnected() && Process::IsAlive();
}
addr_t
@@ -4169,6 +4169,9 @@ ProcessGDBRemote::GetLoadedDynamicLibrar
if (m_gdb_comm.GetLoadedDynamicLibrariesInfosSupported())
{
+ // Scope for the scoped timeout object
+ GDBRemoteCommunication::ScopedTimeout timeout (m_gdb_comm, 10);
+
StructuredData::ObjectSP args_dict(new StructuredData::Dictionary());
args_dict->GetAsDictionary()->AddIntegerItem ("image_list_address",
image_list_address);
args_dict->GetAsDictionary()->AddIntegerItem ("image_count",
image_count);
@@ -4192,8 +4195,6 @@ ProcessGDBRemote::GetLoadedDynamicLibrar
{
if (!response.Empty())
{
- // The packet has already had the 0x7d xor quoting
stripped out at the
- // GDBRemoteCommunication packet receive level.
object_sp = StructuredData::ParseJSON
(response.GetStringRef());
}
}
@@ -4202,7 +4203,6 @@ ProcessGDBRemote::GetLoadedDynamicLibrar
return object_sp;
}
-
// Establish the largest memory read/write payloads we should use.
// If the remote stub has a max packet size, stay under that size.
//
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
