From 7330d0918e4001328f36d7b7f0a806f0a55faadd Mon Sep 17 00:00:00 2001 From: Marc Hartmayer Date: Tue, 7 Aug 2018 13:38:00 +0200 Subject: [PATCH] rpc: Initialize a worker pool for max_workers=0 as well Semantically, there is no difference between an uninitialized worker pool and an initialized worker pool with zero workers. Let's allow the worker pool to be initialized for max_workers=0 as well then which makes the API more symmetric and simplifies code. Validity of the worker pool is delegated to virThreadPoolGetMaxWorkers instead. This patch fixes segmentation faults in virNetServerGetThreadPoolParameters and virNetServerSetThreadPoolParameters for the case when no worker pool is actually initialized (max_workers=0). Signed-off-by: Marc Hartmayer --- src/rpc/virnetserver.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index c26637ed03..b4461b3803 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -205,7 +205,7 @@ virNetServerDispatchNewMessage(virNetServerClientPtr client, virObjectRef(srv); virObjectUnlock(srv); - if (srv->workers) { + if (virThreadPoolGetMaxWorkers(srv->workers) > 0) { virNetServerJobPtr job; if (VIR_ALLOC(job) < 0) @@ -367,8 +367,7 @@ virNetServerPtr virNetServerNew(const char *name, if (!(srv = virObjectLockableNew(virNetServerClass))) return NULL; - if (max_workers && - !(srv->workers = virThreadPoolNew(min_workers, max_workers, + if (!(srv->workers = virThreadPoolNew(min_workers, max_workers, priority_workers, virNetServerHandleJob, srv))) @@ -579,21 +578,18 @@ virJSONValuePtr virNetServerPreExecRestart(virNetServerPtr srv) goto error; if (virJSONValueObjectAppendNumberUint(object, "min_workers", - srv->workers == NULL ? 0 : virThreadPoolGetMinWorkers(srv->workers)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot set min_workers data in JSON document")); goto error; } if (virJSONValueObjectAppendNumberUint(object, "max_workers", - srv->workers == NULL ? 0 : virThreadPoolGetMaxWorkers(srv->workers)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot set max_workers data in JSON document")); goto error; } if (virJSONValueObjectAppendNumberUint(object, "priority_workers", - srv->workers == NULL ? 0 : virThreadPoolGetPriorityWorkers(srv->workers)) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Cannot set priority_workers data in JSON document"));