mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-17 20:44:32 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove ConcurrentQueue::joinAll()

Browse Source 
This function is called only from ~ConcurrentQueue(). joinAll() is not
thread-safe and it cannot be called earlier without introducing a null
state. Moving the function's implementation into the definition of
~ConcurrentQueue() makes the code clearer. Removing joinAll() also
allows to establish and document invariants for two data members.

Assert consistency between jobsLeft and _queue in ~ConcurrentQueue().
This commit is contained in:
Igor Kushnir
2021-03-18 09:51:59 +02:00
committed by Luis Ángel San Martín
parent 61cd245037
commit 4cb542c8cc
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common/concurrent_queue.cpp
View File

@ -16,7 +16,16 @@ ConcurrentQueue::ConcurrentQueue(std::size_t threadCount)
ConcurrentQueue::~ConcurrentQueue()
{
joinAll();
{
std::lock_guard<std::mutex> lock(queueMutex);
assert(!bailout);
bailout = true;
}
jobAvailableVar.notify_all();
for (auto &x : threads)
x.join();
assert(jobsLeft == _queue.size() && "Only not yet started jobs are left.");
}
void ConcurrentQueue::enqueue(Job job)
@ -104,24 +113,3 @@ void ConcurrentQueue::finalizeJobs(std::size_t count)
if (remainingJobs == 0)
_waitVar.notify_all();
}
void ConcurrentQueue::joinAll()
{
{
std::lock_guard<std::mutex> lock(queueMutex);
if (bailout) {
return;
}
bailout = true;
}
jobAvailableVar.notify_all();
for (auto &x : threads) {
if (x.joinable()) {
x.join();
}
}
}