Author: Jonas Devlieghere Date: 2025-04-11T08:53:49-07:00 New Revision: 70627af91f577f5195a11ee44c6af39503e1ce52
URL: https://github.com/llvm/llvm-project/commit/70627af91f577f5195a11ee44c6af39503e1ce52 DIFF: https://github.com/llvm/llvm-project/commit/70627af91f577f5195a11ee44c6af39503e1ce52.diff LOG: [lldb] Synchronize access to m_statusline in the Debugger (#134759) Eliminate the potential for a race between the main thread, the default event handler thread and the signal handling thread, when accessing the m_statusline member. Added: Modified: lldb/include/lldb/Core/Debugger.h lldb/source/Core/Debugger.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Core/Debugger.h b/lldb/include/lldb/Core/Debugger.h index 448e8d6a8fc6a..f36202edbbde0 100644 --- a/lldb/include/lldb/Core/Debugger.h +++ b/lldb/include/lldb/Core/Debugger.h @@ -752,6 +752,8 @@ class Debugger : public std::enable_shared_from_this<Debugger>, IOHandlerStack m_io_handler_stack; std::recursive_mutex m_io_handler_synchronous_mutex; + /// Mutex protecting the m_statusline member. + std::mutex m_statusline_mutex; std::optional<Statusline> m_statusline; llvm::StringMap<std::weak_ptr<LogHandler>> m_stream_handlers; diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index e65d71ddf6960..ce6fb6ed5ec54 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -251,6 +251,7 @@ Status Debugger::SetPropertyValue(const ExecutionContext *exe_ctx, g_debugger_properties[ePropertyShowStatusline].name) { // Statusline setting changed. If we have a statusline instance, update it // now. Otherwise it will get created in the default event handler. + std::lock_guard<std::mutex> guard(m_statusline_mutex); if (StatuslineSupported()) m_statusline.emplace(*this); else @@ -391,8 +392,12 @@ bool Debugger::SetTerminalWidth(uint64_t term_width) { if (auto handler_sp = m_io_handler_stack.Top()) handler_sp->TerminalSizeChanged(); - if (m_statusline) - m_statusline->TerminalSizeChanged(); + + { + std::lock_guard<std::mutex> guard(m_statusline_mutex); + if (m_statusline) + m_statusline->TerminalSizeChanged(); + } return success; } @@ -409,8 +414,12 @@ bool Debugger::SetTerminalHeight(uint64_t term_height) { if (auto handler_sp = m_io_handler_stack.Top()) handler_sp->TerminalSizeChanged(); - if (m_statusline) - m_statusline->TerminalSizeChanged(); + + { + std::lock_guard<std::mutex> guard(m_statusline_mutex); + if (m_statusline) + m_statusline->TerminalSizeChanged(); + } return success; } @@ -1148,8 +1157,11 @@ void Debugger::SetErrorFile(FileSP file_sp) { } void Debugger::SaveInputTerminalState() { - if (m_statusline) - m_statusline->Disable(); + { + std::lock_guard<std::mutex> guard(m_statusline_mutex); + if (m_statusline) + m_statusline->Disable(); + } int fd = GetInputFile().GetDescriptor(); if (fd != File::kInvalidDescriptor) m_terminal_state.Save(fd, true); @@ -1157,11 +1169,15 @@ void Debugger::SaveInputTerminalState() { void Debugger::RestoreInputTerminalState() { m_terminal_state.Restore(); - if (m_statusline) - m_statusline->Enable(); + { + std::lock_guard<std::mutex> guard(m_statusline_mutex); + if (m_statusline) + m_statusline->Enable(); + } } void Debugger::RedrawStatusline(bool update) { + std::lock_guard<std::mutex> guard(m_statusline_mutex); if (m_statusline) m_statusline->Redraw(update); } @@ -2039,8 +2055,11 @@ lldb::thread_result_t Debugger::DefaultEventHandler() { // are now listening to all required events so no events get missed m_sync_broadcaster.BroadcastEvent(eBroadcastBitEventThreadIsListening); - if (!m_statusline && StatuslineSupported()) - m_statusline.emplace(*this); + if (StatuslineSupported()) { + std::lock_guard<std::mutex> guard(m_statusline_mutex); + if (!m_statusline) + m_statusline.emplace(*this); + } bool done = false; while (!done) { @@ -2101,8 +2120,11 @@ lldb::thread_result_t Debugger::DefaultEventHandler() { } } - if (m_statusline) - m_statusline.reset(); + { + std::lock_guard<std::mutex> guard(m_statusline_mutex); + if (m_statusline) + m_statusline.reset(); + } return {}; } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
