[PATCH] D66031: clangd: use -j for background index pool
Ben Jackson via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Fri Aug 9 14:44:59 PDT 2019
puremourning updated this revision to Diff 214454.
puremourning marked 3 inline comments as done.
puremourning added a comment.
When -sync -background-index supplied, use 1 thread for background index.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D66031/new/
https://reviews.llvm.org/D66031
Files:
clang-tools-extra/clangd/ClangdServer.cpp
clang-tools-extra/clangd/tool/ClangdMain.cpp
Index: clang-tools-extra/clangd/tool/ClangdMain.cpp
===================================================================
--- clang-tools-extra/clangd/tool/ClangdMain.cpp
+++ clang-tools-extra/clangd/tool/ClangdMain.cpp
@@ -267,7 +267,8 @@
opt<unsigned> WorkerThreadsCount{
"j",
cat(Misc),
- desc("Number of async workers used by clangd"),
+ desc("Number of async workers used by clangd. Background index also "
+ "uses this many workers."),
init(getDefaultAsyncThreadsCount()),
};
@@ -308,7 +309,8 @@
opt<bool> Sync{
"sync",
cat(Misc),
- desc("Parse on main thread. If set, -j is ignored"),
+ desc("Handle client requests on main thread. Background index still uses "
+ "its own thread."),
init(false),
Hidden,
};
Index: clang-tools-extra/clangd/ClangdServer.cpp
===================================================================
--- clang-tools-extra/clangd/ClangdServer.cpp
+++ clang-tools-extra/clangd/ClangdServer.cpp
@@ -40,9 +40,11 @@
#include "llvm/Support/FileSystem.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
+#include <algorithm>
#include <future>
#include <memory>
#include <mutex>
+#include <type_traits>
namespace clang {
namespace clangd {
@@ -117,8 +119,7 @@
: nullptr),
GetClangTidyOptions(Opts.GetClangTidyOptions),
SuggestMissingIncludes(Opts.SuggestMissingIncludes),
- TweakFilter(Opts.TweakFilter),
- WorkspaceRoot(Opts.WorkspaceRoot),
+ TweakFilter(Opts.TweakFilter), WorkspaceRoot(Opts.WorkspaceRoot),
// Pass a callback into `WorkScheduler` to extract symbols from a newly
// parsed file and rebuild the file index synchronously each time an AST
// is parsed.
@@ -144,7 +145,8 @@
BackgroundIdx = llvm::make_unique<BackgroundIndex>(
Context::current().clone(), FSProvider, CDB,
BackgroundIndexStorage::createDiskBackedStorageFactory(
- [&CDB](llvm::StringRef File) { return CDB.getProjectInfo(File); }));
+ [&CDB](llvm::StringRef File) { return CDB.getProjectInfo(File); }),
+ std::max(Opts.AsyncThreadsCount, static_cast<unsigned int>(1)));
AddIndex(BackgroundIdx.get());
}
if (DynamicIdx)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D66031.214454.patch
Type: text/x-patch
Size: 2256 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190809/05377379/attachment.bin>
More information about the cfe-commits
mailing list