diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-31 12:59:21 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-03-31 12:59:21 +0000 |
commit | bb8713bbc1c4594366fc735c04910edbf4c61aab (patch) | |
tree | d7da56c0b89aa371dd8ad986995dd145fdf6670a /spawn/spawn.c | |
parent | Releasing debian version 1.29.3-4. (diff) | |
download | netdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.tar.xz netdata-bb8713bbc1c4594366fc735c04910edbf4c61aab.zip |
Merging upstream version 1.30.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'spawn/spawn.c')
-rw-r--r-- | spawn/spawn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/spawn/spawn.c b/spawn/spawn.c index 256c04679..017ba7f39 100644 --- a/spawn/spawn.c +++ b/spawn/spawn.c @@ -62,7 +62,7 @@ uint64_t spawn_enq_cmd(char *command_to_run) { unsigned queue_size; uint64_t serial; - avl *avl_ret; + avl_t *avl_ret; struct spawn_cmd_info *cmdinfo; cmdinfo = create_spawn_cmd(command_to_run); @@ -79,8 +79,8 @@ uint64_t spawn_enq_cmd(char *command_to_run) cmdinfo->serial = serial; /* No need to take the cmd mutex since it is unreachable at the moment */ /* enqueue command */ - avl_ret = avl_insert(&spawn_cmd_queue.cmd_tree, (avl *)cmdinfo); - fatal_assert(avl_ret == (avl *)cmdinfo); + avl_ret = avl_insert(&spawn_cmd_queue.cmd_tree, (avl_t *)cmdinfo); + fatal_assert(avl_ret == (avl_t *)cmdinfo); uv_mutex_unlock(&spawn_cmd_queue.mutex); /* wake up event loop */ @@ -93,13 +93,13 @@ uint64_t spawn_enq_cmd(char *command_to_run) */ void spawn_wait_cmd(uint64_t serial, int *exit_status, time_t *exec_run_timestamp) { - avl *avl_ret; + avl_t *avl_ret; struct spawn_cmd_info tmp, *cmdinfo; tmp.serial = serial; uv_mutex_lock(&spawn_cmd_queue.mutex); - avl_ret = avl_search(&spawn_cmd_queue.cmd_tree, (avl *)&tmp); + avl_ret = avl_search(&spawn_cmd_queue.cmd_tree, (avl_t *)&tmp); uv_mutex_unlock(&spawn_cmd_queue.mutex); fatal_assert(avl_ret); /* Could be NULL if more than 1 threads wait for the command */ @@ -122,13 +122,13 @@ void spawn_wait_cmd(uint64_t serial, int *exit_status, time_t *exec_run_timestam void spawn_deq_cmd(struct spawn_cmd_info *cmdinfo) { unsigned queue_size; - avl *avl_ret; + avl_t *avl_ret; uv_mutex_lock(&spawn_cmd_queue.mutex); queue_size = spawn_cmd_queue.size; fatal_assert(queue_size); /* dequeue command */ - avl_ret = avl_remove(&spawn_cmd_queue.cmd_tree, (avl *)cmdinfo); + avl_ret = avl_remove(&spawn_cmd_queue.cmd_tree, (avl_t *)cmdinfo); fatal_assert(avl_ret); spawn_cmd_queue.size = queue_size - 1; |