summaryrefslogtreecommitdiffstats
path: root/clang-tools-extra/clangd/ProtocolHandlers.cpp
diff options
context:
space:
mode:
authorSam McCall <sam.mccall@gmail.com>2018-01-31 13:40:48 +0000
committerSam McCall <sam.mccall@gmail.com>2018-01-31 13:40:48 +0000
commitd1a7a37c22c9a716818f76c7edd1a657bda0f441 (patch)
treef80919eeecda16bc6890e8ff6b6f3cfc94d4090c /clang-tools-extra/clangd/ProtocolHandlers.cpp
parentdd48c6b5194c1fc16be73b5e8e4db554c60af33b (diff)
downloadbcm5719-llvm-d1a7a37c22c9a716818f76c7edd1a657bda0f441.tar.gz
bcm5719-llvm-d1a7a37c22c9a716818f76c7edd1a657bda0f441.zip
[clangd] Pass Context implicitly using TLS.
Summary: Instead of passing Context explicitly around, we now have a thread-local Context object `Context::current()` which is an implicit argument to every function. Most manipulation of this should use the WithContextValue helper, which augments the current Context to add a single KV pair, and restores the old context on destruction. Advantages are: - less boilerplate in functions that just propagate contexts - reading most code doesn't require understanding context at all, and using context as values in fewer places still - fewer options to pass the "wrong" context when it changes within a scope (e.g. when using Span) - contexts pass through interfaces we can't modify, such as VFS - propagating contexts across threads was slightly tricky (e.g. copy vs move, no move-init in lambdas), and is now encapsulated in the threadpool Disadvantages are all the usual TLS stuff - hidden magic, and potential for higher memory usage on threads that don't use the context. (In practice, it's just one pointer) Reviewers: ilya-biryukov Subscribers: klimek, jkorous-apple, ioeric, cfe-commits Differential Revision: https://reviews.llvm.org/D42517 llvm-svn: 323872
Diffstat (limited to 'clang-tools-extra/clangd/ProtocolHandlers.cpp')
-rw-r--r--clang-tools-extra/clangd/ProtocolHandlers.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/clang-tools-extra/clangd/ProtocolHandlers.cpp b/clang-tools-extra/clangd/ProtocolHandlers.cpp
index 7d905bc82b3..930a782ef2a 100644
--- a/clang-tools-extra/clangd/ProtocolHandlers.cpp
+++ b/clang-tools-extra/clangd/ProtocolHandlers.cpp
@@ -24,19 +24,17 @@ namespace {
// FooParams should have a fromJSON function.
struct HandlerRegisterer {
template <typename Param>
- void operator()(StringRef Method,
- void (ProtocolCallbacks::*Handler)(Context, Param)) {
+ void operator()(StringRef Method, void (ProtocolCallbacks::*Handler)(Param)) {
// Capture pointers by value, as the lambda will outlive this object.
auto *Callbacks = this->Callbacks;
- Dispatcher.registerHandler(
- Method, [=](Context C, const json::Expr &RawParams) {
- typename std::remove_reference<Param>::type P;
- if (fromJSON(RawParams, P)) {
- (Callbacks->*Handler)(std::move(C), P);
- } else {
- log(C, "Failed to decode " + Method + " request.");
- }
- });
+ Dispatcher.registerHandler(Method, [=](const json::Expr &RawParams) {
+ typename std::remove_reference<Param>::type P;
+ if (fromJSON(RawParams, P)) {
+ (Callbacks->*Handler)(P);
+ } else {
+ log("Failed to decode " + Method + " request.");
+ }
+ });
}
JSONRPCDispatcher &Dispatcher;
OpenPOWER on IntegriCloud