maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Initialize the thread after the mutex. 

Otherwise locking the mutex yields a racy assertion failure on picky
implementations.

llvm-svn: 295193
This commit is contained in:
Benjamin Kramer 2017-02-15 16:34:58 +00:00
parent a3bc480455
commit 3858b7d6e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang-tools-extra/clangd/ASTManager.h
View File

@ -57,9 +57,6 @@ private:
CompilationDatabases; CompilationDatabases;
std::shared_ptr<clang::PCHContainerOperations> PCHs; std::shared_ptr<clang::PCHContainerOperations> PCHs;
/// We run parsing on a separate thread. This thread looks into PendingRequest
/// as a 'one element work queue' as long as RequestIsPending is true.
std::thread ClangWorker;
/// Queue of requests. /// Queue of requests.
std::deque<std::string> RequestQueue; std::deque<std::string> RequestQueue;
/// Setting Done to true will make the worker thread terminate. /// Setting Done to true will make the worker thread terminate.
@ -68,6 +65,10 @@ private:
std::condition_variable ClangRequestCV; std::condition_variable ClangRequestCV;
/// Lock for accesses to RequestQueue and Done. /// Lock for accesses to RequestQueue and Done.
std::mutex RequestLock; std::mutex RequestLock;
/// We run parsing on a separate thread. This thread looks into PendingRequest
/// as a 'one element work queue' as the queue is non-empty.
std::thread ClangWorker;
}; };
} // namespace clangd } // namespace clangd