diff options
Diffstat (limited to 'src/nvim/event/process.c')
| -rw-r--r-- | src/nvim/event/process.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c index 864fc2c1d8..7460e92766 100644 --- a/src/nvim/event/process.c +++ b/src/nvim/event/process.c @@ -6,8 +6,9 @@ #include "klib/klist.h" #include "nvim/event/libuv_process.h" #include "nvim/event/loop.h" +#include "nvim/event/multiqueue.h" #include "nvim/event/process.h" -#include "nvim/func_attr.h" +#include "nvim/event/stream.h" #include "nvim/globals.h" #include "nvim/log.h" #include "nvim/main.h" @@ -15,7 +16,7 @@ #include "nvim/os/pty_process.h" #include "nvim/os/shell.h" #include "nvim/os/time.h" -#include "nvim/rbuffer.h" +#include "nvim/rbuffer_defs.h" #include "nvim/ui_client.h" #ifdef INCLUDE_GENERATED_DECLARATIONS @@ -133,7 +134,7 @@ void process_teardown(Loop *loop) FUNC_ATTR_NONNULL_ALL Process *proc = (*current)->data; if (proc->detach || proc->type == kProcessTypePty) { // Close handles to process without killing it. - CREATE_EVENT(loop->events, process_close_handles, 1, proc); + CREATE_EVENT(loop->events, process_close_handles, proc); } else { process_stop(proc); } @@ -301,7 +302,7 @@ static void decref(Process *proc) } assert(node); kl_shift_at(WatcherPtr, loop->children, node); - CREATE_EVENT(proc->events, process_close_event, 1, proc); + CREATE_EVENT(proc->events, process_close_event, proc); } static void process_close(Process *proc) @@ -396,7 +397,7 @@ static void process_close_handles(void **argv) static void exit_delay_cb(uv_timer_t *handle) { uv_timer_stop(&main_loop.exit_delay_timer); - multiqueue_put(main_loop.fast_events, exit_event, 1, main_loop.exit_delay_timer.data); + multiqueue_put(main_loop.fast_events, exit_event, main_loop.exit_delay_timer.data); } static void exit_event(void **argv) @@ -421,7 +422,7 @@ static void exit_event(void **argv) void exit_from_channel(int status) { - multiqueue_put(main_loop.fast_events, exit_event, 1, status); + multiqueue_put(main_loop.fast_events, exit_event, (void *)(intptr_t)status); } static void on_process_exit(Process *proc) @@ -439,7 +440,7 @@ static void on_process_exit(Process *proc) // more data directly. Instead delay the reading after the libuv loop by // queueing process_close_handles() as an event. MultiQueue *queue = proc->events ? proc->events : loop->events; - CREATE_EVENT(queue, process_close_handles, 1, proc); + CREATE_EVENT(queue, process_close_handles, proc); } static void on_process_stream_close(Stream *stream, void *data) |