Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a race condition in vmaf_thread_pool_wait. #894

Merged
merged 1 commit into from
Sep 20, 2021
Merged

Fix a race condition in vmaf_thread_pool_wait. #894

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libvmaf/src/thread_pool.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ int vmaf_thread_pool_wait(VmafThreadPool *pool)
if (!pool) return -EINVAL;

pthread_mutex_lock(&(pool->queue.lock));
while((!pool->stop && pool->n_working) || (pool->stop && pool->n_threads))
while((!pool->stop && (pool->n_working || pool->queue.head)) ||
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting that it is probably logically sufficient to just check pool->queue.head, although I'll wait for someone closer to the code to comment.

(If there are other potential fixes, I can test in an environment where failures are likley)

(pool->stop && pool->n_threads))
pthread_cond_wait(&(pool->working), &(pool->queue.lock));
pthread_mutex_unlock(&(pool->queue.lock));
return 0;
Expand Down