Skip to content

[lldb] Synchronize access to m_statusline in the Debugger #134759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JDevlieghere merged 1 commit into from
Apr 11, 2025
Merged

[lldb] Synchronize access to m_statusline in the Debugger #134759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lldb/include/lldb/Core/Debugger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,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;
Expand Down
46 changes: 34 additions & 12 deletions lldb/source/Core/Debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down Expand Up @@ -1141,20 +1150,27 @@ 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);
}

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);
}
Expand Down Expand Up @@ -2032,8 +2048,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) {
Expand Down Expand Up @@ -2094,8 +2113,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 {};
}
Expand Down