diff options
| author |   patrick <patrick@openbsd.org> | 2017-01-14 19:55:43 +0000 |
|---|---|---|
| committer | patrick <patrick@openbsd.org> | 2017-01-14 19:55:43 +0000 |
| commit | bd3306aecb3a15e8967143b8cdbbccf2b1b19b74 (patch) | |
| tree | 309a8132b44564b9e634c0da6815187ce8eab27c /gnu/llvm/lib/Support/ThreadPool.cpp | |
| parent | killp -a should not kill the window if only one pane. (diff) | |
| download | wireguard-openbsd-bd3306aecb3a15e8967143b8cdbbccf2b1b19b74.tar.xz wireguard-openbsd-bd3306aecb3a15e8967143b8cdbbccf2b1b19b74.zip | |
Import LLVM 3.9.1 including clang and lld.
Diffstat (limited to 'gnu/llvm/lib/Support/ThreadPool.cpp')
| -rw-r--r-- | gnu/llvm/lib/Support/ThreadPool.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/llvm/lib/Support/ThreadPool.cpp b/gnu/llvm/lib/Support/ThreadPool.cpp index d4dcb2ee96d..db03a4d6240 100644 --- a/gnu/llvm/lib/Support/ThreadPool.cpp +++ b/gnu/llvm/lib/Support/ThreadPool.cpp @@ -75,8 +75,11 @@ ThreadPool::ThreadPool(unsigned ThreadCount) void ThreadPool::wait() { // Wait for all threads to complete and the queue to be empty std::unique_lock<std::mutex> LockGuard(CompletionLock); + // The order of the checks for ActiveThreads and Tasks.empty() matters because + // any active threads might be modifying the Tasks queue, and this would be a + // race. CompletionCondition.wait(LockGuard, - [&] { return Tasks.empty() && !ActiveThreads; }); + [&] { return !ActiveThreads && Tasks.empty(); }); } std::shared_future<ThreadPool::VoidTy> ThreadPool::asyncImpl(TaskTy Task) { |