Use Process::IsAlive instead of just checking for eStateExited.
Two minor tweaks to GetLoadedDynamicLibrariesInfos.
llvm-svn: 252242
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 4a32187..ccb1c7d 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -2981,7 +2981,7 @@
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 @@
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 @@
{
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 @@
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.
//