From fac56f0df5d62a52364de7fd365be0c0eb45b55a Mon Sep 17 00:00:00 2001 From: Jacob Lalonde Date: Tue, 21 Jan 2025 13:40:23 -0800 Subject: [PATCH 1/2] Wire up DAP to listen to external progress events, and list the enumeration in SBDebugger --- lldb/include/lldb/API/SBDebugger.h | 4 ++++ lldb/tools/lldb-dap/lldb-dap.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lldb/include/lldb/API/SBDebugger.h b/lldb/include/lldb/API/SBDebugger.h index eb371e33c4951..eaa9812a03192 100644 --- a/lldb/include/lldb/API/SBDebugger.h +++ b/lldb/include/lldb/API/SBDebugger.h @@ -48,6 +48,10 @@ class LLDB_API SBDebugger { eBroadcastBitError = lldb::DebuggerBroadcastBit::eBroadcastBitError, eBroadcastBitProgressCategory = lldb::DebuggerBroadcastBit::eBroadcastBitProgressCategory, + eBroadcastBitExternalProgress = + lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgress, + eBroadcastBitExternalProgressCategory = + lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgressCategory, }; SBDebugger(); diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp index 7e8f7b5f6df67..6b12569d90a83 100644 --- a/lldb/tools/lldb-dap/lldb-dap.cpp +++ b/lldb/tools/lldb-dap/lldb-dap.cpp @@ -414,7 +414,8 @@ void SendStdOutStdErr(DAP &dap, lldb::SBProcess &process) { void ProgressEventThreadFunction(DAP &dap) { lldb::SBListener listener("lldb-dap.progress.listener"); dap.debugger.GetBroadcaster().AddListener( - listener, lldb::SBDebugger::eBroadcastBitProgress); + listener, lldb::SBDebugger::eBroadcastBitProgress | + lldb::SBDebugger::eBroadcastBitExternalProgress); dap.broadcaster.AddListener(listener, eBroadcastBitStopProgressThread); lldb::SBEvent event; bool done = false; From edea6f69821ff9ec39479c741efb4eacc5c23746 Mon Sep 17 00:00:00 2001 From: Jacob Lalonde Date: Tue, 21 Jan 2025 14:44:47 -0800 Subject: [PATCH 2/2] Run GCF --- lldb/include/lldb/API/SBDebugger.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lldb/include/lldb/API/SBDebugger.h b/lldb/include/lldb/API/SBDebugger.h index eaa9812a03192..e0819f1684f8b 100644 --- a/lldb/include/lldb/API/SBDebugger.h +++ b/lldb/include/lldb/API/SBDebugger.h @@ -42,16 +42,16 @@ class LLDB_API SBInputReader { class LLDB_API SBDebugger { public: - FLAGS_ANONYMOUS_ENUM(){ - eBroadcastBitProgress = lldb::DebuggerBroadcastBit::eBroadcastBitProgress, - eBroadcastBitWarning = lldb::DebuggerBroadcastBit::eBroadcastBitWarning, - eBroadcastBitError = lldb::DebuggerBroadcastBit::eBroadcastBitError, - eBroadcastBitProgressCategory = - lldb::DebuggerBroadcastBit::eBroadcastBitProgressCategory, - eBroadcastBitExternalProgress = - lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgress, - eBroadcastBitExternalProgressCategory = - lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgressCategory, + FLAGS_ANONYMOUS_ENUM() { + eBroadcastBitProgress = lldb::DebuggerBroadcastBit::eBroadcastBitProgress, + eBroadcastBitWarning = lldb::DebuggerBroadcastBit::eBroadcastBitWarning, + eBroadcastBitError = lldb::DebuggerBroadcastBit::eBroadcastBitError, + eBroadcastBitProgressCategory = + lldb::DebuggerBroadcastBit::eBroadcastBitProgressCategory, + eBroadcastBitExternalProgress = + lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgress, + eBroadcastBitExternalProgressCategory = + lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgressCategory, }; SBDebugger();