Skip to content

[lldb-dap] Destroy debugger when debug session terminates #156231

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
merged 5 commits into from
Sep 4, 2025
Merged

[lldb-dap] Destroy debugger when debug session terminates #156231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c35a97f
[lldb-dap] Destroy debugger when debug session terminates
royitaqi Aug 31, 2025
275db02
Reuse code in SendTerminatedEvent()
royitaqi Sep 2, 2025
b011856
Fix race condition
royitaqi Sep 2, 2025
a803ad2
Move debugger destroy to the end of the DAP lifecycle
royitaqi Sep 3, 2025
6a0693c
Fix format
royitaqi Sep 3, 2025
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
5 changes: 5 additions & 0 deletions lldb/tools/lldb-dap/DAP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,11 @@ llvm::Error DAP::Loop() {
out.Stop();
err.Stop();
StopEventHandlers();

// Destroy the debugger when the session ends. This will trigger the
// debugger's destroy callbacks for earlier logging and clean-ups, rather
// than waiting for the termination of the lldb-dap process.
lldb::SBDebugger::Destroy(debugger);
});

while (true) {
Expand Down
10 changes: 1 addition & 9 deletions lldb/tools/lldb-dap/EventHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,7 @@ llvm::Error SendThreadStoppedEvent(DAP &dap, bool on_entry) {

// Send a "terminated" event to indicate the process is done being
// debugged.
void SendTerminatedEvent(DAP &dap) {
// Prevent races if the process exits while we're being asked to disconnect.
llvm::call_once(dap.terminated_event_flag, [&] {
dap.RunTerminateCommands();
// Send a "terminated" event
llvm::json::Object event(CreateTerminatedEventObject(dap.target));
dap.SendJSON(llvm::json::Value(std::move(event)));
});
}
void SendTerminatedEvent(DAP &dap) { dap.SendTerminatedEvent(); }

// Grab any STDOUT and STDERR from the process and send it up to VS Code
// via an "output" event to the "stdout" and "stderr" categories.
Expand Down
Loading