mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-11-03 16:54:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ConcurrentQueue: remove redundant checks

Browse Source 
The C++ standard specifies `std::condition_variable::wait(lock, pred)`
as equivalent to `while (!pred()) wait(lock);`. It is implemented
exactly so in libstdc++, libc++ and MSVC.
This commit is contained in:
Igor Kushnir
2021-03-18 11:02:07 +02:00
committed by Luis Ángel San Martín
parent 4cb542c8cc
commit 72c78d0164
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/concurrent_queue.cpp
View File

@ -62,11 +62,7 @@ std::size_t ConcurrentQueue::cancelPending()
void ConcurrentQueue::waitAll() void ConcurrentQueue::waitAll()
{ {
std::unique_lock<std::mutex> lock(jobsLeftMutex); std::unique_lock<std::mutex> lock(jobsLeftMutex);
if (jobsLeft > 0) { _waitVar.wait(lock, [this] { return jobsLeft == 0; });
_waitVar.wait(lock, [this] {
return jobsLeft == 0;
});
}
} }
void ConcurrentQueue::nextJob() void ConcurrentQueue::nextJob()
@ -77,10 +73,6 @@ void ConcurrentQueue::nextJob()
{ {
std::unique_lock<std::mutex> lock(queueMutex); std::unique_lock<std::mutex> lock(queueMutex);
if (bailout) {
return;
}
jobAvailableVar.wait(lock, [this] { jobAvailableVar.wait(lock, [this] {
return _queue.size() > 0 || bailout; return _queue.size() > 0 || bailout;
}); });