Stop just send signal for threads to exit when they finish with
current task. Drain waits when all threads will finish.
Signed-off-by: Nikolay Shirokovskiy <nshirokovs...@virtuozzo.com>
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb...@gmail.com>
---
src/libvirt_private.syms | 2 ++
src/util/virthreadpool.c | 43 ++++++++++++++++++++++++++++++++++++++-----
src/util/virthreadpool.h | 3 +++
3 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index cf3ccab..0a9afc5 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -3328,6 +3328,7 @@ virThreadJobSetWorker;
# util/virthreadpool.h
+virThreadPoolDrain;
virThreadPoolFree;
virThreadPoolGetCurrentWorkers;
virThreadPoolGetFreeWorkers;
@@ -3338,6 +3339,7 @@ virThreadPoolGetPriorityWorkers;
virThreadPoolNewFull;
virThreadPoolSendJob;
virThreadPoolSetParameters;
+virThreadPoolStop;
# util/virtime.h
diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index 10a44de..ca44f55 100644
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -268,19 +268,27 @@ virThreadPoolNewFull(size_t minWorkers,
}
-void virThreadPoolFree(virThreadPoolPtr pool)
-{
- virThreadPoolJobPtr job;
- if (!pool)
+static void
+virThreadPoolStopLocked(virThreadPoolPtr pool)
+{
+ if (pool->quit)
return;
- virMutexLock(&pool->mutex);
pool->quit = true;
if (pool->nWorkers > 0)
virCondBroadcast(&pool->cond);
if (pool->nPrioWorkers > 0)
virCondBroadcast(&pool->prioCond);
+}
+
+
+static void
+virThreadPoolDrainLocked(virThreadPoolPtr pool)
+{
+ virThreadPoolJobPtr job;
+
+ virThreadPoolStopLocked(pool);
while (pool->nWorkers > 0 || pool->nPrioWorkers > 0)
ignore_value(virCondWait(&pool->quit_cond, &pool->mutex));
@@ -289,6 +297,15 @@ void virThreadPoolFree(virThreadPoolPtr pool)
pool->jobList.head = pool->jobList.head->next;
VIR_FREE(job);
}
+}
+
+void virThreadPoolFree(virThreadPoolPtr pool)
+{
+ if (!pool)
+ return;
+
+ virMutexLock(&pool->mutex);
+ virThreadPoolDrainLocked(pool);
VIR_FREE(pool->workers);
virMutexUnlock(&pool->mutex);
@@ -475,3 +492,19 @@ virThreadPoolSetParameters(virThreadPoolPtr pool,
virMutexUnlock(&pool->mutex);
return -1;
}
+
+void
+virThreadPoolStop(virThreadPoolPtr pool)
+{
+ virMutexLock(&pool->mutex);
+ virThreadPoolStopLocked(pool);
+ virMutexUnlock(&pool->mutex);
+}
+
+void
+virThreadPoolDrain(virThreadPoolPtr pool)
+{
+ virMutexLock(&pool->mutex);
+ virThreadPoolDrainLocked(pool);
+ virMutexUnlock(&pool->mutex);
+}
diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h
index c97d9b3..dd1aaf3 100644
--- a/src/util/virthreadpool.h
+++ b/src/util/virthreadpool.h
@@ -56,3 +56,6 @@ int virThreadPoolSetParameters(virThreadPoolPtr pool,
long long int minWorkers,
long long int maxWorkers,
long long int prioWorkers);
+
+void virThreadPoolStop(virThreadPoolPtr pool);
+void virThreadPoolDrain(virThreadPoolPtr pool);
--
1.8.3.1
