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

[lldb/gdb-remote] Remove last_stop_packet_mutex 

This is a remnant of the non-stop mode.
This commit is contained in:
Pavel Labath 2021-09-29 11:22:15 +02:00
parent 6cffc35746
commit f6e3abc530
1 changed files with 26 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,8 +251,7 @@ bool ProcessGDBRemote::CanDebug(lldb::TargetSP target_sp,
ProcessGDBRemote::ProcessGDBRemote(lldb::TargetSP target_sp, ProcessGDBRemote::ProcessGDBRemote(lldb::TargetSP target_sp,
ListenerSP listener_sp) ListenerSP listener_sp)
: Process(target_sp, listener_sp), : Process(target_sp, listener_sp),
m_debugserver_pid(LLDB_INVALID_PROCESS_ID), m_last_stop_packet_mutex(), m_debugserver_pid(LLDB_INVALID_PROCESS_ID), m_register_info_sp(nullptr),
m_register_info_sp(nullptr),
m_async_broadcaster(nullptr, "lldb.process.gdb-remote.async-broadcaster"), m_async_broadcaster(nullptr, "lldb.process.gdb-remote.async-broadcaster"),
m_async_listener_sp( m_async_listener_sp(
Listener::MakeListener("lldb.process.gdb-remote.async-listener")), Listener::MakeListener("lldb.process.gdb-remote.async-listener")),
@ -1462,37 +1461,30 @@ bool ProcessGDBRemote::UpdateThreadIDList() {
// See if we can get the thread IDs from the current stop reply packets // See if we can get the thread IDs from the current stop reply packets
// that might contain a "threads" key/value pair // that might contain a "threads" key/value pair
// Lock the thread stack while we access it if (m_last_stop_packet) {
// Mutex::Locker stop_stack_lock(m_last_stop_packet_mutex); // Get the thread stop info
std::unique_lock<std::recursive_mutex> stop_stack_lock( StringExtractorGDBRemote &stop_info = *m_last_stop_packet;
m_last_stop_packet_mutex, std::defer_lock); const std::string &stop_info_str = std::string(stop_info.GetStringRef());
if (stop_stack_lock.try_lock()) {
if (m_last_stop_packet) {
// Get the thread stop info
StringExtractorGDBRemote &stop_info = *m_last_stop_packet;
const std::string &stop_info_str =
std::string(stop_info.GetStringRef());
m_thread_pcs.clear(); m_thread_pcs.clear();
const size_t thread_pcs_pos = stop_info_str.find(";thread-pcs:"); const size_t thread_pcs_pos = stop_info_str.find(";thread-pcs:");
if (thread_pcs_pos != std::string::npos) { if (thread_pcs_pos != std::string::npos) {
const size_t start = thread_pcs_pos + strlen(";thread-pcs:"); const size_t start = thread_pcs_pos + strlen(";thread-pcs:");
const size_t end = stop_info_str.find(';', start); const size_t end = stop_info_str.find(';', start);
if (end != std::string::npos) { if (end != std::string::npos) {
std::string value = stop_info_str.substr(start, end - start); std::string value = stop_info_str.substr(start, end - start);
UpdateThreadPCsFromStopReplyThreadsValue(value); UpdateThreadPCsFromStopReplyThreadsValue(value);
}
} }
}
const size_t threads_pos = stop_info_str.find(";threads:"); const size_t threads_pos = stop_info_str.find(";threads:");
if (threads_pos != std::string::npos) { if (threads_pos != std::string::npos) {
const size_t start = threads_pos + strlen(";threads:"); const size_t start = threads_pos + strlen(";threads:");
const size_t end = stop_info_str.find(';', start); const size_t end = stop_info_str.find(';', start);
if (end != std::string::npos) { if (end != std::string::npos) {
std::string value = stop_info_str.substr(start, end - start); std::string value = stop_info_str.substr(start, end - start);
if (UpdateThreadIDsFromStopReplyThreadsValue(value)) if (UpdateThreadIDsFromStopReplyThreadsValue(value))
return true; return true;
}
} }
} }
} }
@ -2317,14 +2309,9 @@ void ProcessGDBRemote::RefreshStateAfterStop() {
// date before we do that or we might overwrite what was computed here. // date before we do that or we might overwrite what was computed here.
UpdateThreadListIfNeeded(); UpdateThreadListIfNeeded();
// Scope for the lock if (m_last_stop_packet)
{ SetThreadStopInfo(*m_last_stop_packet);
// Lock the thread stack while we access it m_last_stop_packet.reset();
std::lock_guard<std::recursive_mutex> guard(m_last_stop_packet_mutex);
if (m_last_stop_packet)
SetThreadStopInfo(*m_last_stop_packet);
m_last_stop_packet.reset();
}
// If we have queried for a default thread id // If we have queried for a default thread id
if (m_initial_tid != LLDB_INVALID_THREAD_ID) { if (m_initial_tid != LLDB_INVALID_THREAD_ID) {
@ -2571,13 +2558,7 @@ void ProcessGDBRemote::SetLastStopPacket(
m_gdb_comm.ResetDiscoverableSettings(did_exec); m_gdb_comm.ResetDiscoverableSettings(did_exec);
} }
// Scope the lock m_last_stop_packet = response;
{
// Lock the thread stack while we access it
std::lock_guard<std::recursive_mutex> guard(m_last_stop_packet_mutex);
m_last_stop_packet = response;
}
} }
void ProcessGDBRemote::SetUnixSignals(const UnixSignalsSP &signals_sp) { void ProcessGDBRemote::SetUnixSignals(const UnixSignalsSP &signals_sp) {