提交 e925aad3 编写于 作者: M Michal Privoznik

virThreadPoolFree: Set n(Prio)Workers after the pool is locked

In 78839da0 I am trying to join the worker threads. However, I can't
sipmly reuse pool->nWorkers (same applies for pool->nPrioWorkers),
because of the following flow that is currently implemented:

1) the main thread executing virThreadPoolFree sets pool->quit = true,
wakes up all the workers and wait on pool->quit_cond.

2) A worker is woken up and see quit request. It immediately jumps of
the while() loop and decrements pool->nWorkers (or pool->nPrioWorkers in
case of priority worker). The last thread signalizes pool->quit_cond.

3) Main thread is woken up, with both pool->nWorkers and
pool->nPrioWorkers being zero.

So there's a need to copy the original value of worker thread counts
into local variables. However, these need to set *after* the check for
pool being NULL (dereferencing a NULL is no no). And for safety they can
be set right after the pool is locked.
Reported-by: NJohn Ferlan <jferlan@redhat.com>
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 90f9ccb4
...@@ -242,13 +242,15 @@ void virThreadPoolFree(virThreadPoolPtr pool) ...@@ -242,13 +242,15 @@ void virThreadPoolFree(virThreadPoolPtr pool)
virThreadPoolJobPtr job; virThreadPoolJobPtr job;
bool priority = false; bool priority = false;
size_t i; size_t i;
size_t nWorkers = pool->nWorkers; size_t nWorkers;
size_t nPrioWorkers = pool->nPrioWorkers; size_t nPrioWorkers;
if (!pool) if (!pool)
return; return;
virMutexLock(&pool->mutex); virMutexLock(&pool->mutex);
nWorkers = pool->nWorkers;
nPrioWorkers = pool->nPrioWorkers;
pool->quit = true; pool->quit = true;
if (pool->nWorkers > 0) if (pool->nWorkers > 0)
virCondBroadcast(&pool->cond); virCondBroadcast(&pool->cond);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册