Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-02-08 10:30:09 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[mlir-lsp] Guard writing output to JSONTransport with mutex

Browse Source 
This allows for users of the lsp transport libraries to process replies
in parallel, without overlapping/clobbering the output.

Differential Revision: https://reviews.llvm.org/D156295
This commit is contained in:
River Riddle 2023-07-26 00:08:25 -07:00
parent 885275bff2
commit cbdf2ef8a4
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mlir/include/mlir/Tools/lsp-server-support/Transport.h
View File

@ -158,6 +158,7 @@ public:
template <typename T>
OutgoingNotification<T> outgoingNotification(llvm::StringLiteral method) {
return [&, method](const T &params) {
std::lock_guard<std::mutex> transportLock(transportOutputMutex);
Logger::info("--> {0}", method);
transport.notify(method, llvm::json::Value(params));
};
@ -172,6 +173,9 @@ private:
methodHandlers;
JSONTransport &transport;
/// Mutex to guard sending output messages to the transport.
std::mutex transportOutputMutex;
};
} // namespace lsp

16
mlir/lib/Tools/lsp-server-support/Transport.cpp
View File

@ -30,8 +30,8 @@ namespace {
/// - if there were multiple replies, only the first is sent
class Reply {
public:
Reply(const llvm::json::Value &id, StringRef method,
JSONTransport &transport);
Reply(const llvm::json::Value &id, StringRef method, JSONTransport &transport,
std::mutex &transportOutputMutex);
Reply(Reply &&other);
Reply &operator=(Reply &&) = delete;
Reply(const Reply &) = delete;
@ -44,16 +44,19 @@ private:
std::atomic<bool> replied = {false};
llvm::json::Value id;
JSONTransport *transport;
std::mutex &transportOutputMutex;
};
} // namespace
Reply::Reply(const llvm::json::Value &id, llvm::StringRef method,
JSONTransport &transport)
: id(id), transport(&transport) {}
JSONTransport &transport, std::mutex &transportOutputMutex)
: id(id), transport(&transport),
transportOutputMutex(transportOutputMutex) {}
Reply::Reply(Reply &&other)
: replied(other.replied.load()), id(std::move(other.id)),
transport(other.transport) {
transport(other.transport),
transportOutputMutex(other.transportOutputMutex) {
other.transport = nullptr;
}
@ -65,6 +68,7 @@ void Reply::operator()(llvm::Expected<llvm::json::Value> reply) {
}
assert(transport && "expected valid transport to reply to");
std::lock_guard<std::mutex> transportLock(transportOutputMutex);
if (reply) {
Logger::info("--> reply:{0}({1})", method, id);
transport->reply(std::move(id), std::move(reply));
@ -98,7 +102,7 @@ bool MessageHandler::onCall(llvm::StringRef method, llvm::json::Value params,
llvm::json::Value id) {
Logger::info("--> {0}({1})", method, id);
Reply reply(id, method, transport);
Reply reply(id, method, transport, transportOutputMutex);
auto it = methodHandlers.find(method);
if (it != methodHandlers.end()) {