Skip to content

Commit 40c76f5

Browse files
JlalondJDevlieghere
authored andcommitted
[LLDB][LLDB-DAP] Wire up DAP to listen to external progress events (llvm#123826)
Recently I added SBProgress (llvm#119052), and during that original commit I tested if the progress event was sent over LLDB-DAP, and it was. However upon the suggestion of @JDevlieghere and @labath we added an external category (llvm#120171), which I did not test. This small patch wires up DAP to listen for external events by default, and adds the external category to the SBDebugger enumeration. (cherry picked from commit b9813ce)
1 parent d416798 commit 40c76f5

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

lldb/include/lldb/API/SBDebugger.h

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,16 @@ class LLDB_API SBInputReader {
4242

4343
class LLDB_API SBDebugger {
4444
public:
45-
FLAGS_ANONYMOUS_ENUM(){
46-
eBroadcastBitProgress = lldb::DebuggerBroadcastBit::eBroadcastBitProgress,
47-
eBroadcastBitWarning = lldb::DebuggerBroadcastBit::eBroadcastBitWarning,
48-
eBroadcastBitError = lldb::DebuggerBroadcastBit::eBroadcastBitError,
49-
eBroadcastBitProgressCategory =
50-
lldb::DebuggerBroadcastBit::eBroadcastBitProgressCategory,
45+
FLAGS_ANONYMOUS_ENUM() {
46+
eBroadcastBitProgress = lldb::DebuggerBroadcastBit::eBroadcastBitProgress,
47+
eBroadcastBitWarning = lldb::DebuggerBroadcastBit::eBroadcastBitWarning,
48+
eBroadcastBitError = lldb::DebuggerBroadcastBit::eBroadcastBitError,
49+
eBroadcastBitProgressCategory =
50+
lldb::DebuggerBroadcastBit::eBroadcastBitProgressCategory,
51+
eBroadcastBitExternalProgress =
52+
lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgress,
53+
eBroadcastBitExternalProgressCategory =
54+
lldb::DebuggerBroadcastBit::eBroadcastBitExternalProgressCategory,
5155
};
5256
SBDebugger();
5357

lldb/tools/lldb-dap/lldb-dap.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,8 @@ void SendStdOutStdErr(lldb::SBProcess &process) {
416416
void ProgressEventThreadFunction() {
417417
lldb::SBListener listener("lldb-dap.progress.listener");
418418
g_dap.debugger.GetBroadcaster().AddListener(
419-
listener, lldb::SBDebugger::eBroadcastBitProgress);
419+
listener, lldb::SBDebugger::eBroadcastBitProgress |
420+
lldb::SBDebugger::eBroadcastBitExternalProgress);
420421
g_dap.broadcaster.AddListener(listener, eBroadcastBitStopProgressThread);
421422
lldb::SBEvent event;
422423
bool done = false;

0 commit comments

Comments
 (0)