Skip to content

Commit a61c4ff

Browse files
kusmourGerritBuildBot
authored andcommitted
Revert "[lldb-dap] Ensure we acquire the SB API lock while handling requests. (llvm#137026)"
Summary: This reverts commit 3b48e2a. Because this commit caused deadlock between DAP's main loop and the `EventThread()` who are running on different thread and could both obtain the mutex Test Plan: ~~CI the TestDAP_reuseAdapter.py should pass~~ Guess there's no CI ``` [[email protected] ~/llvm-sand/build/Debug/fbcode-x86_64/toolchain]$ bin/llvm-lit ~/llvm-s and/external/llvm-project/lldb/test/API/tools/lldb-dap/reuseDAP/TestDAP_reuseAdapter.py -- Testing: 1 tests, 1 workers -- PASS: lldb-api :: tools/lldb-dap/reuseDAP/TestDAP_reuseAdapter.py (1 of 1) Testing Time: 7.98s Total Discovered Tests: 1 Passed: 1 (100.00%) ``` Rollback Plan: Reviewers: alexandreperez, #lldb_team, peix Reviewed By: alexandreperez Subscribers: pdepetro, #lldb_team Differential Revision: https://phabricator.intern.facebook.com/D78522146
1 parent ee55b2a commit a61c4ff

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

lldb/tools/lldb-dap/Handler/RequestHandler.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "lldb/API/SBDefines.h"
1919
#include "lldb/API/SBEnvironment.h"
2020
#include "llvm/Support/Error.h"
21-
#include <mutex>
2221

2322
#if !defined(_WIN32)
2423
#include <unistd.h>
@@ -138,9 +137,6 @@ void BaseRequestHandler::Run(const Request &request) {
138137
return;
139138
}
140139

141-
lldb::SBMutex lock = dap.GetAPIMutex();
142-
std::lock_guard<lldb::SBMutex> guard(lock);
143-
144140
// FIXME: After all the requests have migrated from LegacyRequestHandler >
145141
// RequestHandler<> we should be able to move this into
146142
// RequestHandler<>::operator().

0 commit comments

Comments
 (0)