rstream/wstream: Unify structures and simplify API

- Simplify RStream/WStream API and make it more consistent with libuv.
- Move into the event loop layer(event subdirectory)
- Remove uv_helpers module.
- Simplify job/process internal modules/API.
- Unify RStream and WStream into a single structure. This is necessary because
  libuv streams can be readable and writable at the same time(and because the
  uv_helpers.c hack to associate multiple streams with libuv handle was removed)
- Make struct definition public, allowing more flexible/simple memory
  management by users of the module.
- Adapt channel/job modules to cope with the changes.

1 files changed, 6 insertions, 30 deletions

diff --git a/src/nvim/os/pipe_process.c b/src/nvim/os/pipe_process.c
index 9980cf7c56..1160015c34 100644
--- a/src/nvim/os/pipe_process.c
+++ b/src/nvim/os/pipe_process.c
@@ -3,7 +3,6 @@
 
 #include <uv.h>
 
-#include "nvim/os/uv_helpers.h"
 #include "nvim/os/job.h"
 #include "nvim/os/job_defs.h"
 #include "nvim/os/job_private.h"
@@ -16,17 +15,9 @@
 # include "os/pipe_process.c.generated.h"
 #endif
 
-typedef struct {
-  // Structures for process spawning/management used by libuv
-  uv_process_t proc;
-  uv_process_options_t proc_opts;
-  uv_stdio_container_t stdio[3];
-  uv_pipe_t proc_stdin, proc_stdout, proc_stderr;
-} UvProcess;
-
-void pipe_process_init(Job *job)
+bool pipe_process_spawn(Job *job)
 {
-  UvProcess *pipeproc = xmalloc(sizeof(UvProcess));
+  UvProcess *pipeproc = &job->process.uv;
   pipeproc->proc_opts.file = job->opts.argv[0];
   pipeproc->proc_opts.args = job->opts.argv;
   pipeproc->proc_opts.stdio = pipeproc->stdio;
@@ -45,7 +36,7 @@ void pipe_process_init(Job *job)
   pipeproc->stdio[1].flags = UV_IGNORE;
   pipeproc->stdio[2].flags = UV_IGNORE;
 
-  handle_set_job((uv_handle_t *)&pipeproc->proc, job);
+  pipeproc->proc.data = job;
 
   if (job->opts.writable) {
     uv_pipe_init(&loop.uv, &pipeproc->proc_stdin, 0);
@@ -68,20 +59,6 @@ void pipe_process_init(Job *job)
   job->proc_stdin = (uv_stream_t *)&pipeproc->proc_stdin;
   job->proc_stdout = (uv_stream_t *)&pipeproc->proc_stdout;
   job->proc_stderr = (uv_stream_t *)&pipeproc->proc_stderr;
-  job->process = pipeproc;
-}
-
-void pipe_process_destroy(Job *job)
-{
-  UvProcess *pipeproc = job->process;
-  xfree(pipeproc->proc.data);
-  xfree(pipeproc);
-  job->process = NULL;
-}
-
-bool pipe_process_spawn(Job *job)
-{
-  UvProcess *pipeproc = job->process;
 
   if (uv_spawn(&loop.uv, &pipeproc->proc, &pipeproc->proc_opts) != 0) {
     return false;
@@ -93,20 +70,19 @@ bool pipe_process_spawn(Job *job)
 
 void pipe_process_close(Job *job)
 {
-  UvProcess *pipeproc = job->process;
-  uv_close((uv_handle_t *)&pipeproc->proc, close_cb);
+  uv_close((uv_handle_t *)&job->process.uv.proc, close_cb);
 }
 
 static void exit_cb(uv_process_t *proc, int64_t status, int term_signal)
 {
-  Job *job = handle_get_job((uv_handle_t *)proc);
+  Job *job = proc->data;
   job->status = (int)status;
   pipe_process_close(job);
 }
 
 static void close_cb(uv_handle_t *handle)
 {
-  Job *job = handle_get_job(handle);
+  Job *job = handle->data;
   job_close_streams(job);
   job_decref(job);
 }