From b9d17c6a8a6485bc7a33cabbfafb9c60741e6943 Mon Sep 17 00:00:00 2001 From: Seth Jackson Date: Mon, 24 Aug 2015 20:09:27 -0400 Subject: Windows: avoid "uv_" naming conflicts. #3225 --- src/nvim/eval.c | 6 ++-- src/nvim/event/libuv_process.c | 77 ++++++++++++++++++++++++++++++++++++++++++ src/nvim/event/libuv_process.h | 25 ++++++++++++++ src/nvim/event/process.c | 8 ++--- src/nvim/event/uv_process.c | 77 ------------------------------------------ src/nvim/event/uv_process.h | 25 -------------- src/nvim/msgpack_rpc/channel.c | 6 ++-- src/nvim/os/shell.c | 4 +-- 8 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 src/nvim/event/libuv_process.c create mode 100644 src/nvim/event/libuv_process.h delete mode 100644 src/nvim/event/uv_process.c delete mode 100644 src/nvim/event/uv_process.h (limited to 'src') diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 2eb0194d85..3c9d725667 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -84,7 +84,7 @@ #include "nvim/version.h" #include "nvim/window.h" #include "nvim/os/os.h" -#include "nvim/event/uv_process.h" +#include "nvim/event/libuv_process.h" #include "nvim/event/pty_process.h" #include "nvim/event/rstream.h" #include "nvim/event/wstream.h" @@ -456,7 +456,7 @@ static dictitem_T vimvars_var; /* variable used for v: */ typedef struct { union { - UvProcess uv; + LibuvProcess uv; PtyProcess pty; } proc; Stream in, out, err; @@ -21100,7 +21100,7 @@ static inline TerminalJobData *common_job_init(char **argv, ufunc_T *on_stdout, if (pty) { data->proc.pty = pty_process_init(&loop, data); } else { - data->proc.uv = uv_process_init(&loop, data); + data->proc.uv = libuv_process_init(&loop, data); } Process *proc = (Process *)&data->proc; proc->argv = argv; diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c new file mode 100644 index 0000000000..e0a108a6e4 --- /dev/null +++ b/src/nvim/event/libuv_process.c @@ -0,0 +1,77 @@ +#include + +#include + +#include "nvim/event/loop.h" +#include "nvim/event/rstream.h" +#include "nvim/event/wstream.h" +#include "nvim/event/process.h" +#include "nvim/event/libuv_process.h" +#include "nvim/log.h" + +#ifdef INCLUDE_GENERATED_DECLARATIONS +# include "event/libuv_process.c.generated.h" +#endif + +bool libuv_process_spawn(LibuvProcess *uvproc) + FUNC_ATTR_NONNULL_ALL +{ + Process *proc = (Process *)uvproc; + uvproc->uvopts.file = proc->argv[0]; + uvproc->uvopts.args = proc->argv; + uvproc->uvopts.flags = UV_PROCESS_WINDOWS_HIDE; + uvproc->uvopts.exit_cb = exit_cb; + uvproc->uvopts.cwd = NULL; + uvproc->uvopts.env = NULL; + uvproc->uvopts.stdio = uvproc->uvstdio; + uvproc->uvopts.stdio_count = 3; + uvproc->uvstdio[0].flags = UV_IGNORE; + uvproc->uvstdio[1].flags = UV_IGNORE; + uvproc->uvstdio[2].flags = UV_IGNORE; + uvproc->uv.data = proc; + + if (proc->in) { + uvproc->uvstdio[0].flags = UV_CREATE_PIPE | UV_READABLE_PIPE; + uvproc->uvstdio[0].data.stream = (uv_stream_t *)&proc->in->uv.pipe; + } + + if (proc->out) { + uvproc->uvstdio[1].flags = UV_CREATE_PIPE | UV_WRITABLE_PIPE; + uvproc->uvstdio[1].data.stream = (uv_stream_t *)&proc->out->uv.pipe; + } + + if (proc->err) { + uvproc->uvstdio[2].flags = UV_CREATE_PIPE | UV_WRITABLE_PIPE; + uvproc->uvstdio[2].data.stream = (uv_stream_t *)&proc->err->uv.pipe; + } + + int status; + if ((status = uv_spawn(&proc->loop->uv, &uvproc->uv, &uvproc->uvopts))) { + ELOG("uv_spawn failed: %s", uv_strerror(status)); + return false; + } + + proc->pid = uvproc->uv.pid; + return true; +} + +void libuv_process_close(LibuvProcess *uvproc) + FUNC_ATTR_NONNULL_ARG(1) +{ + uv_close((uv_handle_t *)&uvproc->uv, close_cb); +} + +static void close_cb(uv_handle_t *handle) +{ + Process *proc = handle->data; + if (proc->internal_close_cb) { + proc->internal_close_cb(proc); + } +} + +static void exit_cb(uv_process_t *handle, int64_t status, int term_signal) +{ + Process *proc = handle->data; + proc->status = (int)status; + proc->internal_exit_cb(proc); +} diff --git a/src/nvim/event/libuv_process.h b/src/nvim/event/libuv_process.h new file mode 100644 index 0000000000..aaaa896e10 --- /dev/null +++ b/src/nvim/event/libuv_process.h @@ -0,0 +1,25 @@ +#ifndef NVIM_EVENT_LIBUV_PROCESS_H +#define NVIM_EVENT_LIBUV_PROCESS_H + +#include + +#include "nvim/event/process.h" + +typedef struct libuv_process { + Process process; + uv_process_t uv; + uv_process_options_t uvopts; + uv_stdio_container_t uvstdio[3]; +} LibuvProcess; + +static inline LibuvProcess libuv_process_init(Loop *loop, void *data) +{ + LibuvProcess rv; + rv.process = process_init(loop, kProcessTypeUv, data); + return rv; +} + +#ifdef INCLUDE_GENERATED_DECLARATIONS +# include "event/libuv_process.h.generated.h" +#endif +#endif // NVIM_EVENT_LIBUV_PROCESS_H diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c index bacbf4f8c7..0336eb880a 100644 --- a/src/nvim/event/process.c +++ b/src/nvim/event/process.c @@ -8,7 +8,7 @@ #include "nvim/event/rstream.h" #include "nvim/event/wstream.h" #include "nvim/event/process.h" -#include "nvim/event/uv_process.h" +#include "nvim/event/libuv_process.h" #include "nvim/event/pty_process.h" #include "nvim/globals.h" #include "nvim/log.h" @@ -47,7 +47,7 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL bool success; switch (proc->type) { case kProcessTypeUv: - success = uv_process_spawn((UvProcess *)proc); + success = libuv_process_spawn((LibuvProcess *)proc); break; case kProcessTypePty: success = pty_process_spawn((PtyProcess *)proc); @@ -68,7 +68,7 @@ bool process_spawn(Process *proc) FUNC_ATTR_NONNULL_ALL } if (proc->type == kProcessTypeUv) { - uv_close((uv_handle_t *)&(((UvProcess *)proc)->uv), NULL); + uv_close((uv_handle_t *)&(((LibuvProcess *)proc)->uv), NULL); } else { process_close(proc); } @@ -307,7 +307,7 @@ static void process_close(Process *proc) proc->closed = true; switch (proc->type) { case kProcessTypeUv: - uv_process_close((UvProcess *)proc); + libuv_process_close((LibuvProcess *)proc); break; case kProcessTypePty: pty_process_close((PtyProcess *)proc); diff --git a/src/nvim/event/uv_process.c b/src/nvim/event/uv_process.c deleted file mode 100644 index 21c2fd1790..0000000000 --- a/src/nvim/event/uv_process.c +++ /dev/null @@ -1,77 +0,0 @@ -#include - -#include - -#include "nvim/event/loop.h" -#include "nvim/event/rstream.h" -#include "nvim/event/wstream.h" -#include "nvim/event/process.h" -#include "nvim/event/uv_process.h" -#include "nvim/log.h" - -#ifdef INCLUDE_GENERATED_DECLARATIONS -# include "event/uv_process.c.generated.h" -#endif - -bool uv_process_spawn(UvProcess *uvproc) - FUNC_ATTR_NONNULL_ALL -{ - Process *proc = (Process *)uvproc; - uvproc->uvopts.file = proc->argv[0]; - uvproc->uvopts.args = proc->argv; - uvproc->uvopts.flags = UV_PROCESS_WINDOWS_HIDE; - uvproc->uvopts.exit_cb = exit_cb; - uvproc->uvopts.cwd = NULL; - uvproc->uvopts.env = NULL; - uvproc->uvopts.stdio = uvproc->uvstdio; - uvproc->uvopts.stdio_count = 3; - uvproc->uvstdio[0].flags = UV_IGNORE; - uvproc->uvstdio[1].flags = UV_IGNORE; - uvproc->uvstdio[2].flags = UV_IGNORE; - uvproc->uv.data = proc; - - if (proc->in) { - uvproc->uvstdio[0].flags = UV_CREATE_PIPE | UV_READABLE_PIPE; - uvproc->uvstdio[0].data.stream = (uv_stream_t *)&proc->in->uv.pipe; - } - - if (proc->out) { - uvproc->uvstdio[1].flags = UV_CREATE_PIPE | UV_WRITABLE_PIPE; - uvproc->uvstdio[1].data.stream = (uv_stream_t *)&proc->out->uv.pipe; - } - - if (proc->err) { - uvproc->uvstdio[2].flags = UV_CREATE_PIPE | UV_WRITABLE_PIPE; - uvproc->uvstdio[2].data.stream = (uv_stream_t *)&proc->err->uv.pipe; - } - - int status; - if ((status = uv_spawn(&proc->loop->uv, &uvproc->uv, &uvproc->uvopts))) { - ELOG("uv_spawn failed: %s", uv_strerror(status)); - return false; - } - - proc->pid = uvproc->uv.pid; - return true; -} - -void uv_process_close(UvProcess *uvproc) - FUNC_ATTR_NONNULL_ARG(1) -{ - uv_close((uv_handle_t *)&uvproc->uv, close_cb); -} - -static void close_cb(uv_handle_t *handle) -{ - Process *proc = handle->data; - if (proc->internal_close_cb) { - proc->internal_close_cb(proc); - } -} - -static void exit_cb(uv_process_t *handle, int64_t status, int term_signal) -{ - Process *proc = handle->data; - proc->status = (int)status; - proc->internal_exit_cb(proc); -} diff --git a/src/nvim/event/uv_process.h b/src/nvim/event/uv_process.h deleted file mode 100644 index 5ee73044b5..0000000000 --- a/src/nvim/event/uv_process.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef NVIM_EVENT_UV_PROCESS_H -#define NVIM_EVENT_UV_PROCESS_H - -#include - -#include "nvim/event/process.h" - -typedef struct uv_process { - Process process; - uv_process_t uv; - uv_process_options_t uvopts; - uv_stdio_container_t uvstdio[3]; -} UvProcess; - -static inline UvProcess uv_process_init(Loop *loop, void *data) -{ - UvProcess rv; - rv.process = process_init(loop, kProcessTypeUv, data); - return rv; -} - -#ifdef INCLUDE_GENERATED_DECLARATIONS -# include "event/uv_process.h.generated.h" -#endif -#endif // NVIM_EVENT_UV_PROCESS_H diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c index d8f86cefab..45e78d6e79 100644 --- a/src/nvim/msgpack_rpc/channel.c +++ b/src/nvim/msgpack_rpc/channel.c @@ -10,7 +10,7 @@ #include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/remote_ui.h" #include "nvim/event/loop.h" -#include "nvim/event/uv_process.h" +#include "nvim/event/libuv_process.h" #include "nvim/event/rstream.h" #include "nvim/event/wstream.h" #include "nvim/event/socket.h" @@ -55,7 +55,7 @@ typedef struct { union { Stream stream; struct { - UvProcess uvproc; + LibuvProcess uvproc; Stream in; Stream out; Stream err; @@ -119,7 +119,7 @@ void channel_teardown(void) uint64_t channel_from_process(char **argv) { Channel *channel = register_channel(kChannelTypeProc); - channel->data.process.uvproc = uv_process_init(&loop, channel); + channel->data.process.uvproc = libuv_process_init(&loop, channel); Process *proc = &channel->data.process.uvproc.process; proc->argv = argv; proc->in = &channel->data.process.in; diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c index 2d97c4bf4f..57e25560de 100644 --- a/src/nvim/os/shell.c +++ b/src/nvim/os/shell.c @@ -9,7 +9,7 @@ #include "nvim/lib/kvec.h" #include "nvim/log.h" #include "nvim/event/loop.h" -#include "nvim/event/uv_process.h" +#include "nvim/event/libuv_process.h" #include "nvim/event/rstream.h" #include "nvim/os/shell.h" #include "nvim/os/signal.h" @@ -205,7 +205,7 @@ static int do_os_system(char **argv, xstrlcpy(prog, argv[0], MAXPATHL); Stream in, out, err; - UvProcess uvproc = uv_process_init(&loop, &buf); + LibuvProcess uvproc = libuv_process_init(&loop, &buf); Process *proc = &uvproc.process; Queue *events = queue_new_child(loop.events); proc->events = events; -- cgit