dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Worker thread pool: Fix worker wake CV notify condition

Browse Source 
The worker wake CV was only notified when the job queue was empty.
Now notify if the number of queued jobs is less than the number
of waiting workers.
This commit is contained in:
Jonathan G Rennison
2023-04-09 01:34:04 +01:00
parent 06e0f39aff
commit 2ff513f0cd
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/worker_thread.cpp
View File

@@ -42,7 +42,7 @@ void WorkerThreadPool::Stop()
{
std::unique_lock<std::mutex> lk(this->lock);
this->exit = true;
this->empty_cv.notify_all();
this->worker_wait_cv.notify_all();
this->done_cv.wait(lk, [this]() { return this->workers == 0; });
}
@@ -55,10 +55,10 @@ void WorkerThreadPool::EnqueueJob(WorkerJobFunc *func, void *data1, void *data2,
func(data1, data2, data3);
return;
}
bool notify = this->jobs.empty();
bool notify = this->jobs.size() < (size_t)this->workers_waiting;
this->jobs.push({ func, data1, data2, data3 });
lk.unlock();
if (notify) this->empty_cv.notify_one();
if (notify) this->worker_wait_cv.notify_one();
}
void WorkerThreadPool::Run(WorkerThreadPool *pool)
@@ -66,7 +66,9 @@ void WorkerThreadPool::Run(WorkerThreadPool *pool)
std::unique_lock<std::mutex> lk(pool->lock);
while (!pool->exit || !pool->jobs.empty()) {
if (pool->jobs.empty()) {
pool->empty_cv.wait(lk);
pool->workers_waiting++;
pool->worker_wait_cv.wait(lk);
pool->workers_waiting--;
} else {
WorkerJob job = pool->jobs.front();
pool->jobs.pop();