diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-26 18:05:15 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-26 18:05:42 +0000 |
| commit | 112b5b91647c3dea45cc1c9bc364df526c8012f1 (patch) | |
| tree | 450af925135ec664c4310a1eb28b69481094ee2a /spawn | |
| parent | Releasing debian version 1.32.1-2. (diff) | |
| download | netdata-112b5b91647c3dea45cc1c9bc364df526c8012f1.tar.xz netdata-112b5b91647c3dea45cc1c9bc364df526c8012f1.zip | |
Merging upstream version 1.33.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'spawn')
| -rw-r--r-- | spawn/spawn.c | 7 | ||||
| -rw-r--r-- | spawn/spawn_client.c | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/spawn/spawn.c b/spawn/spawn.c index 46853ecb..051955e8 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 59f1ccb0..509c6734 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); } |