RFC: More flexible pipe API

include/uv-private/uv-win.h

@@ -165,6 +165,8 @@ typedef struct uv_buf_t {
 
 typedef int uv_file;
 
+typedef HANDLE uv_os_handle_t;
+
 typedef SOCKET uv_os_sock_t;
 
 typedef HANDLE uv_thread_t;
@@ -351,7 +353,10 @@ RB_HEAD(uv_timer_tree_s, uv_timer_s);
 #define uv_pipe_connection_fields         \
   uv_timer_t* eof_timer;                  \
   uv_write_t ipc_header_write_req;        \
-  int ipc_pid;                            \
+  union {								  \
+    int pid;							  \
+    int *p_pid;							  \
+  } ipc_pid;							  \
   uint64_t remaining_ipc_rawdata_bytes;   \
   struct {                                \
     WSAPROTOCOL_INFOW* socket_info;       \

include/uv.h

@@ -904,20 +904,41 @@ UV_EXTERN uv_handle_type uv_guess_handle(uv_file file);
  * uv_pipe_t is a subclass of uv_stream_t
  *
  * Representing a pipe stream or pipe server. On Windows this is a Named
- * Pipe. On Unix this is a UNIX domain socket.
+ * Pipe. On Unix this is a UNIX domain sockets
+ *
+ * A single uv_pipe_t always represents one end of a pipe. You can use
+ * uv_pipe_link to create a pair of connected pipe ends.
  */
 struct uv_pipe_s {
   UV_HANDLE_FIELDS
   UV_STREAM_FIELDS
   UV_PIPE_PRIVATE_FIELDS
-  int ipc; /* non-zero if this pipe is used for passing handles */
+};
+
+enum uv_pipe_flags {
+	UV_PIPE_IPC			 = 0x01,
+	UV_PIPE_SPAWN_SAFE	 = 0x02,
+	UV_PIPE_READABLE	 = 0x04,
+	UV_PIPE_WRITEABLE	 = 0x08,
 };
 
 /*
  * Initialize a pipe. The last argument is a boolean to indicate if
  * this pipe will be used for handle passing between processes.
  */
-UV_EXTERN int uv_pipe_init(uv_loop_t*, uv_pipe_t* handle, int ipc);
+UV_EXTERN int uv_pipe_init(uv_loop_t*, uv_pipe_t* handle, int flags);
+
+/*
+ * Creates a pipe and assigns the two pipe ends to the given uv_pipe_t's
+ */
+UV_EXTERN int uv_pipe_link(uv_pipe_t *read, uv_pipe_t *write);
+
+/*
+ * Attempt to synchronously close the given pipe. This will only work if the pipe is
+ * inactive (i.e. not reading, writing listening, connecting, etc. Otherwise this function 
+ * will abort()
+ */
+UV_EXTERN void uv_pipe_close_sync(uv_pipe_t *pipe);
 
 /*
  * Opens an existing file descriptor or HANDLE as a pipe.
@@ -927,7 +948,7 @@ UV_EXTERN void uv_pipe_open(uv_pipe_t*, uv_file file);
 UV_EXTERN int uv_pipe_bind(uv_pipe_t* handle, const char* name);
 
 UV_EXTERN void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle,
-    const char* name, uv_connect_cb cb);
+    const char* name, uv_connect_cb cb); 
 
 /*
  * This setting applies to Windows only.
@@ -1163,30 +1184,22 @@ UV_EXTERN int uv_getaddrinfo(uv_loop_t*, uv_getaddrinfo_t* handle,
 
 UV_EXTERN void uv_freeaddrinfo(struct addrinfo* ai);
 
-/* uv_spawn() options */
 typedef enum {
-  UV_IGNORE         = 0x00,
-  UV_CREATE_PIPE    = 0x01,
-  UV_INHERIT_FD     = 0x02,
-  UV_INHERIT_STREAM = 0x04,
-
-  /* When UV_CREATE_PIPE is specified, UV_READABLE_PIPE and UV_WRITABLE_PIPE
-   * determine the direction of flow, from the child process' perspective. Both
-   * flags may be specified to create a duplex data stream.
-   */
-  UV_READABLE_PIPE  = 0x10,
-  UV_WRITABLE_PIPE  = 0x20
-} uv_stdio_flags;
+	UV_STREAM	  = 0x00, //uv_stream_t*
+	UV_RAW_FD	  = 0x01, //fd for both unix and windows
+	UV_RAW_HANDLE = 0x02, //HANDLE on windows, same as UV_RAW_FD on unix
+} uv_stdio_type;
 
 typedef struct uv_stdio_container_s {
-  uv_stdio_flags flags;
-
-  union {
-    uv_stream_t* stream;
-    int fd;
-  } data;
+	uv_stdio_type type;
+	union {
+		uv_stream_t *stream;
+		uv_file fd;
+		uv_os_handle_t os_handle;
+	} data;
 } uv_stdio_container_t;
 
+/* uv_spawn() options */
 typedef struct uv_process_options_s {
   uv_exit_cb exit_cb; /* Called after the process exits. */
   const char* file; /* Path to program to execute. */
@@ -1221,16 +1234,16 @@ typedef struct uv_process_options_s {
   uv_gid_t gid;
 
   /*
-   * The `stdio` field points to an array of uv_stdio_container_t structs that
+   * The `stdio` field points to an array of uv_pipe_t structs that
    * describe the file descriptors that will be made available to the child
    * process. The convention is that stdio[0] points to stdin, fd 1 is used for
    * stdout, and fd 2 is stderr.
    *
    * Note that on windows file descriptors greater than 2 are available to the
-   * child process only if the child processes uses the MSVCRT runtime.
+   * child process only if the child processes uses the MSVCRT.
    */
   int stdio_count;
-  uv_stdio_container_t* stdio;
+  uv_stdio_container_t *stdio;
 } uv_process_options_t;
 
 /*

src/win/internal.h

@@ -70,8 +70,14 @@
 #define UV_HANDLE_SHARED_TCP_SOCKET             0x40000000
 
 /* Only used by uv_pipe_t handles. */
-#define UV_HANDLE_NON_OVERLAPPED_PIPE           0x01000000
-#define UV_HANDLE_PIPESERVER                    0x02000000
+#define UV_HANDLE_PIPE_IPC						0x01000000
+#define UV_HANDLE_PIPE_SPAWN_SAFE				0x02000000
+#define UV_HANDLE_PIPE_READABLE					0x04000000
+#define UV_HANDLE_PIPE_WRITEABLE				0x08000000
+#define UV_HANDLE_NON_OVERLAPPED_PIPE           0x10000000
+#define UV_HANDLE_PIPESERVER                    0x20000000
+#define UV_HANDLE_PIPE_IPC_CLIENT				0x40000000
+
 
 /* Only used by uv_tty_t handles. */
 #define UV_HANDLE_TTY_RAW                       0x01000000