From 112b5b91647c3dea45cc1c9bc364df526c8012f1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 26 Jan 2022 19:05:15 +0100 Subject: Merging upstream version 1.33.0. Signed-off-by: Daniel Baumann --- spawn/spawn.c | 7 +++---- spawn/spawn_client.c | 5 ++--- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'spawn') diff --git a/spawn/spawn.c b/spawn/spawn.c index 46853ecb9..051955e88 100644 --- a/spawn/spawn.c +++ b/spawn/spawn.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "spawn.h" -#include "database/engine/rrdenginelib.h" static uv_thread_t thread; int spawn_thread_error; @@ -240,15 +239,15 @@ void spawn_init(void) init_spawn_cmd_queue(); - init_completion(&completion); + completion_init(&completion); error = uv_thread_create(&thread, spawn_client, &completion); if (error) { error("uv_thread_create(): %s", uv_strerror(error)); goto after_error; } /* wait for spawn client thread to initialize */ - wait_for_completion(&completion); - destroy_completion(&completion); + completion_wait_for(&completion); + completion_destroy(&completion); uv_thread_set_name_np(thread, "DAEMON_SPAWN"); if (spawn_thread_error) { diff --git a/spawn/spawn_client.c b/spawn/spawn_client.c index 59f1ccb05..509c67347 100644 --- a/spawn/spawn_client.c +++ b/spawn/spawn_client.c @@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-3.0-or-later #include "spawn.h" -#include "database/engine/rrdenginelib.h" static uv_process_t process; static uv_pipe_t spawn_channel; @@ -201,7 +200,7 @@ void spawn_client(void *arg) spawn_thread_error = 0; spawn_thread_shutdown = 0; /* wake up initialization thread */ - complete(completion); + completion_mark_complete(completion); prot_buffer_len = 0; ret = uv_read_start((uv_stream_t *)&spawn_channel, on_read_alloc, on_pipe_read); @@ -237,5 +236,5 @@ error_after_loop_init: freez(loop); /* wake up initialization thread */ - complete(completion); + completion_mark_complete(completion); } -- cgit v1.2.3