facebook
/
zstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[pzstd] Fix latent bug in WorkQueue

dev
Nick Terrell 2016-10-06 15:51:58 -07:00
parent b0f6d73002
commit 87629978d3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/pzstd/utils/WorkQueue.h
View File

@ -28,6 +28,7 @@ class WorkQueue {
std::mutex mutex_; std::mutex mutex_;
std::condition_variable readerCv_; std::condition_variable readerCv_;
std::condition_variable writerCv_; std::condition_variable writerCv_;
std::condition_variable finishCv_;
std::queue<T> queue_; std::queue<T> queue_;
bool done_; bool done_;
@ -124,19 +125,14 @@ class WorkQueue {
} }
readerCv_.notify_all(); readerCv_.notify_all();
writerCv_.notify_all(); writerCv_.notify_all();
finishCv_.notify_all();
} }
/// Blocks until `finish()` has been called (but the queue may not be empty). /// Blocks until `finish()` has been called (but the queue may not be empty).
void waitUntilFinished() { void waitUntilFinished() {
std::unique_lock<std::mutex> lock(mutex_); std::unique_lock<std::mutex> lock(mutex_);
while (!done_) { while (!done_) {
readerCv_.wait(lock); finishCv_.wait(lock);
// If we were woken by a push, we need to wake a thread waiting on pop().
if (!done_) {
lock.unlock();
readerCv_.notify_one();
lock.lock();
}
} }
} }
}; };