alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

indexer: fix race condition

Browse Source 
It was possible for the worker to stop before the work was even started; and
then we might wait forever for the queue to become empty.
This commit is contained in:
Dirk-Jan C. Binnema
2021-11-22 21:52:01 +02:00
parent d0bb0f215a
commit 0ade4ecfa7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/index/mu-indexer.cc
View File

@ -198,7 +198,8 @@ Indexer::Private::worker()
g_debug("started worker"); g_debug("started worker");
while (state_ == IndexState::Scanning || !fq_.empty()) { while (state_ == IndexState::Scanning) {
if (!fq_.pop(item, 250ms)) if (!fq_.pop(item, 250ms))
continue; continue;
try { try {
@ -261,9 +262,12 @@ Indexer::Private::start(const Indexer::Config& conf)
conf_.scan ? "yes" : "no", conf_.scan ? "yes" : "no",
conf_.cleanup ? "yes" : "no"); conf_.cleanup ? "yes" : "no");
workers_.emplace_back(std::thread([this] { worker(); }));
state_.change_to(IndexState::Scanning); state_.change_to(IndexState::Scanning);
{
/* kick off the first worker, which will spawn more if needed. */
std::lock_guard<std::mutex> wlock{wlock_};
workers_.emplace_back(std::thread([this] { worker(); }));
}
scanner_worker_ = std::thread([this] { scanner_worker_ = std::thread([this] {
progress_ = {}; progress_ = {};