Large diffs are not rendered by default.

@@ -832,7 +832,7 @@ static int uv_create_stdio_pipe_pair(uv_loop_t* loop, uv_pipe_t* server_pipe,
static int duplicate_std_handle(uv_loop_t* loop, DWORD id, HANDLE* dup) {
HANDLE handle;
HANDLE current_process = GetCurrentProcess();

handle = GetStdHandle(id);

if (handle == NULL) {
@@ -47,6 +47,8 @@ void uv_connection_init(uv_stream_t* handle) {
handle->read_req.wait_handle = INVALID_HANDLE_VALUE;
handle->read_req.type = UV_READ;
handle->read_req.data = handle;

handle->shutdown_req = NULL;
}


@@ -169,6 +171,7 @@ int uv_shutdown(uv_shutdown_t* req, uv_stream_t* handle, uv_shutdown_cb cb) {
handle->flags |= UV_HANDLE_SHUTTING;
handle->shutdown_req = req;
handle->reqs_pending++;
uv_ref(loop);

uv_want_endgame(loop, (uv_handle_t*)handle);

@@ -194,5 +197,5 @@ int uv_is_readable(uv_stream_t* handle) {


int uv_is_writable(uv_stream_t* handle) {
return !(handle->flags & UV_HANDLE_SHUT);
return !(handle->flags & UV_HANDLE_SHUTTING);
}
@@ -167,11 +167,13 @@ void uv_tcp_endgame(uv_loop_t* loop, uv_tcp_t* handle) {
uv_tcp_accept_t* req;

if (handle->flags & UV_HANDLE_CONNECTION &&
handle->flags & UV_HANDLE_SHUTTING &&
!(handle->flags & UV_HANDLE_SHUT) &&
handle->shutdown_req != NULL &&
handle->write_reqs_pending == 0) {

if (shutdown(handle->socket, SD_SEND) != SOCKET_ERROR) {
if (handle->flags & UV_HANDLE_CLOSING) {
status = -1;
sys_error = WSAEINTR;
} else if (shutdown(handle->socket, SD_SEND) != SOCKET_ERROR) {
status = 0;
handle->flags |= UV_HANDLE_SHUT;
} else {
@@ -185,6 +187,9 @@ void uv_tcp_endgame(uv_loop_t* loop, uv_tcp_t* handle) {
handle->shutdown_req->cb(handle->shutdown_req, status);
}

handle->shutdown_req = NULL;

uv_unref(loop);
DECREASE_PENDING_REQ_COUNT(handle);
return;
}
@@ -548,7 +553,7 @@ int uv_tcp_accept(uv_tcp_t* server, uv_tcp_t* client) {

if (server->processed_accepts >= uv_simultaneous_server_accepts) {
server->processed_accepts = 0;
/*
/*
* All previously queued accept requests are now processed.
* We now switch to queueing just a single accept.
*/
@@ -639,10 +644,12 @@ int uv__tcp_connect(uv_connect_t* req,
if (UV_SUCCEEDED_WITHOUT_IOCP(success)) {
/* Process the req without IOCP. */
handle->reqs_pending++;
uv_ref(loop);
uv_insert_pending_req(loop, (uv_req_t*)req);
} else if (UV_SUCCEEDED_WITH_IOCP(success)) {
/* The req will be processed with IOCP. */
handle->reqs_pending++;
uv_ref(loop);
} else {
uv__set_sys_error(loop, WSAGetLastError());
return -1;
@@ -698,9 +705,11 @@ int uv__tcp_connect6(uv_connect_t* req,

if (UV_SUCCEEDED_WITHOUT_IOCP(success)) {
handle->reqs_pending++;
uv_ref(loop);
uv_insert_pending_req(loop, (uv_req_t*)req);
} else if (UV_SUCCEEDED_WITH_IOCP(success)) {
handle->reqs_pending++;
uv_ref(loop);
} else {
uv__set_sys_error(loop, WSAGetLastError());
return -1;
@@ -795,12 +804,14 @@ int uv_tcp_write(uv_loop_t* loop, uv_write_t* req, uv_tcp_t* handle,
handle->reqs_pending++;
handle->write_reqs_pending++;
uv_insert_pending_req(loop, (uv_req_t*) req);
uv_ref(loop);
} else if (UV_SUCCEEDED_WITH_IOCP(result == 0)) {
/* Request queued by the kernel. */
req->queued_bytes = uv_count_bufs(bufs, bufcnt);
handle->reqs_pending++;
handle->write_reqs_pending++;
handle->write_queue_size += req->queued_bytes;
uv_ref(loop);
} else {
/* Send failed due to an error. */
uv__set_sys_error(loop, WSAGetLastError());
@@ -831,7 +842,7 @@ void uv_process_tcp_read_req(uv_loop_t* loop, uv_tcp_t* handle,
err = GET_REQ_SOCK_ERROR(req);

if (err == WSAECONNABORTED) {
/*
/*
* Turn WSAECONNABORTED into UV_ECONNRESET to be consistent with Unix.
*/
uv__set_error(loop, UV_ECONNRESET, err);
@@ -900,7 +911,7 @@ void uv_process_tcp_read_req(uv_loop_t* loop, uv_tcp_t* handle,
handle->read_cb((uv_stream_t*)handle, 0, buf);
} else {
if (err == WSAECONNABORTED) {
/*
/*
* Turn WSAECONNABORTED into UV_ECONNRESET to be consistent with Unix.
*/
uv__set_error(loop, UV_ECONNRESET, err);
@@ -946,6 +957,7 @@ void uv_process_tcp_write_req(uv_loop_t* loop, uv_tcp_t* handle,
}

DECREASE_PENDING_REQ_COUNT(handle);
uv_unref(loop);
}


@@ -1020,6 +1032,7 @@ void uv_process_tcp_connect_req(uv_loop_t* loop, uv_tcp_t* handle,
}

DECREASE_PENDING_REQ_COUNT(handle);
uv_unref(loop);
}


@@ -1086,7 +1099,7 @@ int uv_tcp_duplicate_socket(uv_tcp_t* handle, int pid,
LPWSAPROTOCOL_INFOW protocol_info) {
assert(!(handle->flags & UV_HANDLE_CONNECTION));

/*
/*
* We're about to share the socket with another process. Because
* this is a listening socket, we assume that the other process will
* be accepting connections on it. So, before sharing the socket
@@ -1683,6 +1683,7 @@ int uv_tty_write(uv_loop_t* loop, uv_write_t* req, uv_tty_t* handle,

handle->reqs_pending++;
handle->write_reqs_pending++;
uv_ref(loop);

req->queued_bytes = 0;

@@ -1715,10 +1716,13 @@ void uv_process_tty_write_req(uv_loop_t* loop, uv_tty_t* handle,
}

DECREASE_PENDING_REQ_COUNT(handle);
uv_unref(loop);
}


void uv_tty_close(uv_tty_t* handle) {
handle->flags |= UV_HANDLE_SHUTTING;

uv_tty_read_stop(handle);
CloseHandle(handle->handle);

@@ -1729,17 +1733,22 @@ void uv_tty_close(uv_tty_t* handle) {


void uv_tty_endgame(uv_loop_t* loop, uv_tty_t* handle) {
if (handle->flags & UV_HANDLE_CONNECTION &&
handle->flags & UV_HANDLE_SHUTTING &&
!(handle->flags & UV_HANDLE_SHUT) &&
if ((handle->flags && UV_HANDLE_CONNECTION) &&
handle->shutdown_req != NULL &&
handle->write_reqs_pending == 0) {
handle->flags |= UV_HANDLE_SHUT;

/* TTY shutdown is really just a no-op */
if (handle->shutdown_req->cb) {
handle->shutdown_req->cb(handle->shutdown_req, 0);
if (handle->flags & UV_HANDLE_CLOSING) {
uv__set_sys_error(loop, WSAEINTR);
handle->shutdown_req->cb(handle->shutdown_req, -1);
} else {
handle->shutdown_req->cb(handle->shutdown_req, 0);
}
}

handle->shutdown_req = NULL;

uv_unref(loop);
DECREASE_PENDING_REQ_COUNT(handle);
return;
}
@@ -400,11 +400,13 @@ static int uv__udp_send(uv_udp_send_t* req, uv_udp_t* handle, uv_buf_t bufs[],
/* Request completed immediately. */
req->queued_bytes = 0;
handle->reqs_pending++;
uv_ref(loop);
uv_insert_pending_req(loop, (uv_req_t*)req);
} else if (UV_SUCCEEDED_WITH_IOCP(result == 0)) {
/* Request queued by the kernel. */
req->queued_bytes = uv_count_bufs(bufs, bufcnt);
handle->reqs_pending++;
uv_ref(loop);
} else {
/* Send failed due to an error. */
uv__set_sys_error(loop, WSAGetLastError());
@@ -569,6 +571,7 @@ void uv_process_udp_send_req(uv_loop_t* loop, uv_udp_t* handle,
}
}

uv_unref(loop);
DECREASE_PENDING_REQ_COUNT(handle);
}

@@ -490,11 +490,13 @@ uv_err_t uv_interface_addresses(uv_interface_address_t** addresses,
unsigned long size = 0;
IP_ADAPTER_ADDRESSES* adapter_addresses;
IP_ADAPTER_ADDRESSES* adapter_address;
IP_ADAPTER_UNICAST_ADDRESS_XP* unicast_address;
uv_interface_address_t* address;
struct sockaddr* sock_addr;
int length;
char* name;
/* Use IP_ADAPTER_UNICAST_ADDRESS_XP to retain backwards compatibility */
/* with Windows XP */
IP_ADAPTER_UNICAST_ADDRESS_XP* unicast_address;

if (GetAdaptersAddresses(AF_UNSPEC, 0, NULL, NULL, &size)
!= ERROR_BUFFER_OVERFLOW) {
@@ -517,7 +519,8 @@ uv_err_t uv_interface_addresses(uv_interface_address_t** addresses,
for (adapter_address = adapter_addresses;
adapter_address != NULL;
adapter_address = adapter_address->Next) {
unicast_address = adapter_address->FirstUnicastAddress;
unicast_address = (IP_ADAPTER_UNICAST_ADDRESS_XP*)
adapter_address->FirstUnicastAddress;
while (unicast_address) {
(*count)++;
unicast_address = unicast_address->Next;
@@ -536,7 +539,8 @@ uv_err_t uv_interface_addresses(uv_interface_address_t** addresses,
adapter_address != NULL;
adapter_address = adapter_address->Next) {
name = NULL;
unicast_address = adapter_address->FirstUnicastAddress;
unicast_address = (IP_ADAPTER_UNICAST_ADDRESS_XP*)
adapter_address->FirstUnicastAddress;

while (unicast_address) {
sock_addr = unicast_address->Address.lpSockaddr;
@@ -610,6 +614,7 @@ void uv_filetime_to_time_t(FILETIME* file_time, time_t* stat_time) {
time.tm_hour = system_time.wHour;
time.tm_min = system_time.wMinute;
time.tm_sec = system_time.wSecond;
time.tm_isdst = -1;

*stat_time = mktime(&time);
} else {
@@ -4323,10 +4323,17 @@ typedef NTSTATUS (NTAPI *sNtSetInformationFile)
/*
* Kernel32 headers
*/
#define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS 0x1
#define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2
#ifndef FILE_SKIP_COMPLETION_PORT_ON_SUCCESS
# define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS 0x1
#endif

#ifdef FILE_SKIP_SET_EVENT_ON_HANDLE
# define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2
#endif

#define SYMBOLIC_LINK_FLAG_DIRECTORY 0x1
#ifndef SYMBOLIC_LINK_FLAG_DIRECTORY
# define SYMBOLIC_LINK_FLAG_DIRECTORY 0x1
#endif

#ifdef __MINGW32__
typedef struct _OVERLAPPED_ENTRY {
@@ -107,7 +107,9 @@ static void connect_cb(uv_connect_t* req, int status) {

if (status != 0) {
#if DEBUG
fprintf(stderr, "connect error %s\n", uv_err_name(uv_last_error()));
fprintf(stderr,
"connect error %s\n",
uv_err_name(uv_last_error(uv_default_loop())));
#endif
uv_close((uv_handle_t*)req->handle, close_cb);
conns_failed++;
@@ -25,7 +25,7 @@
#include <stdio.h>
#include <stdlib.h>

#define NUM_THREADS (100 * 1000)
#define NUM_THREADS (20 * 1000)

static volatile int num_threads;

@@ -86,7 +86,7 @@ static void ipc_on_connection(uv_stream_t* server, int status) {
uv_tcp_t* conn;

if (!connection_accepted) {
/*
/*
* Accept the connection and close it. Also let the other
* side know.
*/
@@ -121,7 +121,7 @@ static int ipc_helper(int listen_after_write) {
* data is transfered over the channel. XXX edit this comment after handle
* transfer is added.
*/

uv_write_t write_req;
int r;
uv_buf_t buf;
@@ -131,8 +131,8 @@ static int ipc_helper(int listen_after_write) {

uv_pipe_open(&channel, 0);

ASSERT(uv_is_readable((uv_stream_t*)&channel));
ASSERT(uv_is_writable((uv_stream_t*)&channel));
ASSERT(uv_is_readable((uv_stream_t*) &channel));
ASSERT(uv_is_writable((uv_stream_t*) &channel));

r = uv_tcp_init(uv_default_loop(), &tcp_server);
ASSERT(r == 0);
@@ -208,7 +208,7 @@ static int stdio_over_pipes_helper() {
uv_buf_t buf[ARRAY_SIZE(buffers)];
int r, i;
uv_loop_t* loop = uv_default_loop();

ASSERT(UV_NAMED_PIPE == uv_guess_handle(0));
ASSERT(UV_NAMED_PIPE == uv_guess_handle(1));

@@ -271,6 +271,11 @@ static int maybe_run_test(int argc, char **argv) {
return ipc_helper(1);
}

if (strcmp(argv[1], "ipc_send_recv_helper") == 0) {
int ipc_send_recv_helper(void); /* See test-ipc-send-recv.c */
return ipc_send_recv_helper();
}

if (strcmp(argv[1], "stdio_over_pipes_helper") == 0) {
return stdio_over_pipes_helper();
}
@@ -135,7 +135,7 @@ int process_start(char *name, char *part, process_info_t *p) {
p->stdio_in = nul;
p->stdio_out = file;
p->process = pi.hProcess;
p->name = name;
p->name = part;

return 0;

@@ -186,14 +186,17 @@ int run_test(const char* test, int timeout, int benchmark_output) {
process_terminate(&processes[i]);
}

if (process_wait(processes, process_count - 1, -1) < 0) {
if (process_count > 0 &&
process_wait(processes, process_count - 1, -1) < 0) {
FATAL("process_wait failed");
}

/* Show error and output from processes if the test failed. */
if (status != 0 || task->show_output) {
if (status != 0) {
LOGF("\n`%s` failed: %s\n", test, errmsg);
} else {
LOGF("\n");
}

for (i = 0; i < process_count; i++) {
@@ -92,21 +92,21 @@ static void create_cb(uv_fs_t* req) {

TEST_IMPL(counters_init) {
int r;
int eio_init_prev;
int req_init_prev;
int handle_init_prev;
int stream_init_prev;
int tcp_init_prev;
int udp_init_prev;
int pipe_init_prev;
int tty_init_prev;
int prepare_init_prev;
int check_init_prev;
int idle_init_prev;
int async_init_prev;
int timer_init_prev;
int process_init_prev;
int fs_event_init_prev;
uint64_t eio_init_prev;
uint64_t req_init_prev;
uint64_t handle_init_prev;
uint64_t stream_init_prev;
uint64_t tcp_init_prev;
uint64_t udp_init_prev;
uint64_t pipe_init_prev;
uint64_t tty_init_prev;
uint64_t prepare_init_prev;
uint64_t check_init_prev;
uint64_t idle_init_prev;
uint64_t async_init_prev;
uint64_t timer_init_prev;
uint64_t process_init_prev;
uint64_t fs_event_init_prev;

/* req_init and eio_init test by uv_fs_open() */
unlink("test_file");
@@ -37,17 +37,20 @@ TEST_IMPL(cwd_and_chdir) {
err = uv_cwd(buffer_orig, size);
ASSERT(err.code == UV_OK);

last_slash = strrchr(buffer_orig,
/* Remove trailing slash unless at a root directory. */
#ifdef _WIN32
'\\'
#else
'/'
#endif
);

last_slash = strrchr(buffer_orig, '\\');
ASSERT(last_slash);

*last_slash = '\0';
if (last_slash > buffer_orig && *(last_slash - 1) != ':') {
*last_slash = '\0';
}
#else /* Unix */
last_slash = strrchr(buffer_orig, '/');
ASSERT(last_slash);
if (last_slash != buffer_orig) {
*last_slash = '\0';
}
#endif

err = uv_chdir(buffer_orig);
ASSERT(err.code == UV_OK);
@@ -115,7 +115,7 @@ void check_permission(const char* filename, int mode) {

s = req.ptr;
#ifdef _WIN32
/*
/*
* On Windows, chmod can only modify S_IWUSR (_S_IWRITE) bit,
* so only testing for the specified flags.
*/
@@ -186,8 +186,14 @@ static void chown_cb(uv_fs_t* req) {

static void chown_root_cb(uv_fs_t* req) {
ASSERT(req->fs_type == UV_FS_CHOWN);
#ifdef _WIN32
/* On windows, chown is a no-op and always succeeds. */
ASSERT(req->result == 0);
#else
/* On unix, chown'ing the root directory is not allowed. */
ASSERT(req->result == -1);
ASSERT(req->errorno == UV_EPERM);
#endif
chown_cb_count++;
uv_fs_req_cleanup(req);
}
@@ -1218,7 +1224,7 @@ TEST_IMPL(fs_symlink) {
*/
return 0;
} else if (uv_last_error(loop).sys_errno_ == ERROR_PRIVILEGE_NOT_HELD) {
/*
/*
* Creating a symlink is only allowed when running elevated.
* We pass the test and bail out early if we get ERROR_PRIVILEGE_NOT_HELD.
*/
@@ -1667,3 +1673,59 @@ TEST_IMPL(fs_rename_to_existing_file) {

return 0;
}


TEST_IMPL(fs_read_file_eof) {
int r;

/* Setup. */
unlink("test_file");

loop = uv_default_loop();

r = uv_fs_open(loop, &open_req1, "test_file", O_WRONLY | O_CREAT,
S_IWRITE | S_IREAD, NULL);
ASSERT(r != -1);
ASSERT(open_req1.result != -1);
uv_fs_req_cleanup(&open_req1);

r = uv_fs_write(loop, &write_req, open_req1.result, test_buf,
sizeof(test_buf), -1, NULL);
ASSERT(r != -1);
ASSERT(write_req.result != -1);
uv_fs_req_cleanup(&write_req);

r = uv_fs_close(loop, &close_req, open_req1.result, NULL);
ASSERT(r != -1);
ASSERT(close_req.result != -1);
uv_fs_req_cleanup(&close_req);

r = uv_fs_open(loop, &open_req1, "test_file", O_RDONLY, 0, NULL);
ASSERT(r != -1);
ASSERT(open_req1.result != -1);
uv_fs_req_cleanup(&open_req1);

memset(buf, 0, sizeof(buf));
r = uv_fs_read(loop, &read_req, open_req1.result, buf, sizeof(buf), -1,
NULL);
ASSERT(r != -1);
ASSERT(read_req.result != -1);
ASSERT(strcmp(buf, test_buf) == 0);
uv_fs_req_cleanup(&read_req);

r = uv_fs_read(loop, &read_req, open_req1.result, buf, sizeof(buf),
read_req.result, NULL);
ASSERT(r == 0);
ASSERT(read_req.result == 0);
uv_fs_req_cleanup(&read_req);

r = uv_fs_close(loop, &close_req, open_req1.result, NULL);
ASSERT(r != -1);
ASSERT(close_req.result != -1);
uv_fs_req_cleanup(&close_req);

/* Cleanup */
unlink("test_file");

return 0;
}
@@ -0,0 +1,208 @@
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/

#include "uv.h"
#include "task.h"

#include <stdio.h>
#include <string.h>

/* See test-ipc.ctx */
void spawn_helper(uv_pipe_t* channel,
uv_process_t* process,
const char* helper);

union handles {
uv_handle_t handle;
uv_stream_t stream;
uv_pipe_t pipe;
uv_tcp_t tcp;
uv_tty_t tty;
};

struct echo_ctx {
uv_pipe_t channel;
uv_write_t write_req;
uv_handle_type expected_type;
union handles send;
union handles recv;
};

static struct echo_ctx ctx;
static int num_recv_handles;


static uv_buf_t alloc_cb(uv_handle_t* handle, size_t suggested_size) {
/* we're not actually reading anything so a small buffer is okay */
static char buf[8];
return uv_buf_init(buf, sizeof(buf));
}


static void recv_cb(uv_pipe_t* handle,
ssize_t nread,
uv_buf_t buf,
uv_handle_type pending) {
int r;

ASSERT(pending == ctx.expected_type);
ASSERT(handle == &ctx.channel);
ASSERT(nread >= 0);

if (pending == UV_NAMED_PIPE)
r = uv_pipe_init(ctx.channel.loop, &ctx.recv.pipe, 0);
else if (pending == UV_TCP)
r = uv_tcp_init(ctx.channel.loop, &ctx.recv.tcp);
else
abort();
ASSERT(r == 0);

r = uv_accept((uv_stream_t*)&ctx.channel, &ctx.recv.stream);
ASSERT(r == 0);

uv_close((uv_handle_t*)&ctx.channel, NULL);
uv_close(&ctx.send.handle, NULL);
uv_close(&ctx.recv.handle, NULL);
num_recv_handles++;
}


static int run_test(void) {
uv_process_t process;
uv_buf_t buf;
int r;

spawn_helper(&ctx.channel, &process, "ipc_send_recv_helper");

buf = uv_buf_init(".", 1);
r = uv_write2(&ctx.write_req,
(uv_stream_t*)&ctx.channel,
&buf, 1,
&ctx.send.stream,
NULL);
ASSERT(r == 0);

r = uv_read2_start((uv_stream_t*)&ctx.channel, alloc_cb, recv_cb);
ASSERT(r == 0);

r = uv_run(uv_default_loop());
ASSERT(r == 0);

ASSERT(num_recv_handles == 1);

return 0;
}


TEST_IMPL(ipc_send_recv_pipe) {
int r;

ctx.expected_type = UV_NAMED_PIPE;

r = uv_pipe_init(uv_default_loop(), &ctx.send.pipe, 1);
ASSERT(r == 0);

r = uv_pipe_bind(&ctx.send.pipe, TEST_PIPENAME);
ASSERT(r == 0);

return run_test();
}


TEST_IMPL(ipc_send_recv_tcp) {
int r;

ctx.expected_type = UV_TCP;

r = uv_tcp_init(uv_default_loop(), &ctx.send.tcp);
ASSERT(r == 0);

r = uv_tcp_bind(&ctx.send.tcp, uv_ip4_addr("127.0.0.1", TEST_PORT));
ASSERT(r == 0);

return run_test();
}


/* Everything here runs in a child process. */

static void write2_cb(uv_write_t* req, int status) {
ASSERT(status == 0);
uv_close(&ctx.recv.handle, NULL);
uv_close((uv_handle_t*)&ctx.channel, NULL);
}


static void read2_cb(uv_pipe_t* handle,
ssize_t nread,
uv_buf_t buf,
uv_handle_type pending) {
int r;

ASSERT(pending == UV_NAMED_PIPE || pending == UV_TCP);
ASSERT(handle == &ctx.channel);
ASSERT(nread >= 0);

buf = uv_buf_init(".", 1);

if (pending == UV_NAMED_PIPE)
r = uv_pipe_init(ctx.channel.loop, &ctx.recv.pipe, 0);
else if (pending == UV_TCP)
r = uv_tcp_init(ctx.channel.loop, &ctx.recv.tcp);
else
abort();
ASSERT(r == 0);

r = uv_accept((uv_stream_t*)handle, &ctx.recv.stream);
ASSERT(r == 0);

r = uv_write2(&ctx.write_req,
(uv_stream_t*)&ctx.channel,
&buf, 1,
&ctx.recv.stream,
write2_cb);
ASSERT(r == 0);
}


/* stdin is a duplex channel over which a handle is sent.
* We receive it and send it back where it came from.
*/
int ipc_send_recv_helper(void) {
int r;

memset(&ctx, 0, sizeof(ctx));

r = uv_pipe_init(uv_default_loop(), &ctx.channel, 1);
ASSERT(r == 0);

uv_pipe_open(&ctx.channel, 0);
ASSERT(uv_is_readable((uv_stream_t*)&ctx.channel));
ASSERT(uv_is_writable((uv_stream_t*)&ctx.channel));

r = uv_read2_start((uv_stream_t*)&ctx.channel, alloc_cb, read2_cb);
ASSERT(r == 0);

r = uv_run(uv_default_loop());
ASSERT(r == 0);

return 0;
}
@@ -25,9 +25,6 @@
#include <stdio.h>
#include <string.h>

static char exepath[1024];
static size_t exepath_size = 1024;
static char* args[3];
static uv_pipe_t channel;
static uv_tcp_t tcp_server;

@@ -184,31 +181,44 @@ static void on_read(uv_pipe_t* pipe, ssize_t nread, uv_buf_t buf,
}


int run_ipc_test(const char* helper) {
int r;
void spawn_helper(uv_pipe_t* channel,
uv_process_t* process,
const char* helper) {
uv_process_options_t options;
uv_process_t process;
size_t exepath_size;
char exepath[1024];
char* args[3];
int r;

r = uv_pipe_init(uv_default_loop(), &channel, 1);
r = uv_pipe_init(uv_default_loop(), channel, 1);
ASSERT(r == 0);
ASSERT(channel.ipc);

memset(&options, 0, sizeof(uv_process_options_t));
ASSERT(channel->ipc);

exepath_size = sizeof(exepath);
r = uv_exepath(exepath, &exepath_size);
ASSERT(r == 0);

exepath[exepath_size] = '\0';
args[0] = exepath;
args[1] = (char*)helper;
args[2] = NULL;

memset(&options, 0, sizeof(options));
options.file = exepath;
options.args = args;
options.exit_cb = exit_cb;
options.stdin_stream = &channel;
options.stdin_stream = channel;

r = uv_spawn(uv_default_loop(), &process, options);
r = uv_spawn(uv_default_loop(), process, options);
ASSERT(r == 0);
}


static int run_ipc_test(const char* helper) {
uv_process_t process;
int r;

spawn_helper(&channel, &process, helper);
uv_read2_start((uv_stream_t*)&channel, on_alloc, on_read);

r = uv_run(uv_default_loop());
@@ -218,6 +228,7 @@ int run_ipc_test(const char* helper) {
ASSERT(remote_conn_accepted == 1);
ASSERT(read2_cb_called == 1);
ASSERT(exit_cb_called == 1);

return 0;
}

@@ -24,6 +24,8 @@ TEST_DECLARE (tty)
TEST_DECLARE (stdio_over_pipes)
TEST_DECLARE (ipc_listen_before_write)
TEST_DECLARE (ipc_listen_after_write)
TEST_DECLARE (ipc_send_recv_pipe)
TEST_DECLARE (ipc_send_recv_tcp)
TEST_DECLARE (tcp_ping_pong)
TEST_DECLARE (tcp_ping_pong_v6)
TEST_DECLARE (pipe_ping_pong)
@@ -61,6 +63,8 @@ TEST_DECLARE (pipe_connect_bad_name)
TEST_DECLARE (pipe_connect_to_file)
TEST_DECLARE (connection_fail)
TEST_DECLARE (connection_fail_doesnt_auto_close)
TEST_DECLARE (shutdown_close_tcp)
TEST_DECLARE (shutdown_close_pipe)
TEST_DECLARE (shutdown_eof)
TEST_DECLARE (callback_stack)
TEST_DECLARE (error_message)
@@ -81,12 +85,16 @@ TEST_DECLARE (fs_event_ref)
TEST_DECLARE (tcp_ref)
TEST_DECLARE (tcp_ref2)
TEST_DECLARE (tcp_ref3)
TEST_DECLARE (tcp_ref4)
TEST_DECLARE (tcp_ref5)
TEST_DECLARE (udp_ref)
TEST_DECLARE (udp_ref2)
TEST_DECLARE (udp_ref3)
TEST_DECLARE (pipe_ref)
TEST_DECLARE (pipe_ref2)
TEST_DECLARE (pipe_ref3)
TEST_DECLARE (pipe_ref4)
TEST_DECLARE (pipe_ref5)
TEST_DECLARE (process_ref)
TEST_DECLARE (async)
TEST_DECLARE (get_currentexe)
@@ -124,6 +132,7 @@ TEST_DECLARE (fs_utime)
TEST_DECLARE (fs_futime)
TEST_DECLARE (fs_file_open_append)
TEST_DECLARE (fs_stat_missing_path)
TEST_DECLARE (fs_read_file_eof)
TEST_DECLARE (fs_event_watch_dir)
TEST_DECLARE (fs_event_watch_file)
TEST_DECLARE (fs_event_watch_file_current_dir)
@@ -167,6 +176,8 @@ TASK_LIST_START
TEST_ENTRY (stdio_over_pipes)
TEST_ENTRY (ipc_listen_before_write)
TEST_ENTRY (ipc_listen_after_write)
TEST_ENTRY (ipc_send_recv_pipe)
TEST_ENTRY (ipc_send_recv_tcp)

TEST_ENTRY (tcp_ping_pong)
TEST_HELPER (tcp_ping_pong, tcp4_echo_server)
@@ -217,6 +228,11 @@ TASK_LIST_START
TEST_ENTRY (connection_fail)
TEST_ENTRY (connection_fail_doesnt_auto_close)

TEST_ENTRY (shutdown_close_tcp)
TEST_HELPER (shutdown_close_tcp, tcp4_echo_server)
TEST_ENTRY (shutdown_close_pipe)
TEST_HELPER (shutdown_close_pipe, pipe_echo_server)

TEST_ENTRY (shutdown_eof)
TEST_HELPER (shutdown_eof, tcp4_echo_server)

@@ -243,6 +259,10 @@ TASK_LIST_START
TEST_ENTRY (tcp_ref2)
TEST_ENTRY (tcp_ref3)
TEST_HELPER (tcp_ref3, tcp4_echo_server)
TEST_ENTRY (tcp_ref4)
TEST_HELPER (tcp_ref4, tcp4_echo_server)
TEST_ENTRY (tcp_ref5)
TEST_HELPER (tcp_ref5, tcp4_echo_server)
TEST_ENTRY (udp_ref)
TEST_ENTRY (udp_ref2)
TEST_ENTRY (udp_ref3)
@@ -251,6 +271,10 @@ TASK_LIST_START
TEST_ENTRY (pipe_ref2)
TEST_ENTRY (pipe_ref3)
TEST_HELPER (pipe_ref3, pipe_echo_server)
TEST_ENTRY (pipe_ref4)
TEST_HELPER (pipe_ref4, pipe_echo_server)
TEST_ENTRY (pipe_ref5)
TEST_HELPER (pipe_ref5, pipe_echo_server)
TEST_ENTRY (process_ref)

TEST_ENTRY (loop_handles)
@@ -308,6 +332,7 @@ TASK_LIST_START
TEST_ENTRY (fs_futime)
TEST_ENTRY (fs_symlink)
TEST_ENTRY (fs_stat_missing_path)
TEST_ENTRY (fs_read_file_eof)
TEST_ENTRY (fs_file_open_append)
TEST_ENTRY (fs_event_watch_dir)
TEST_ENTRY (fs_event_watch_file)
@@ -26,11 +26,39 @@
#include <string.h>


static uv_write_t write_req;
static uv_shutdown_t shutdown_req;
static uv_connect_t connect_req;

static char buffer[32767];


static void fail_cb(void) {
FATAL("fail_cb should not have been called");
}


static void write_unref_cb(uv_connect_t* req, int status) {
uv_buf_t buf = uv_buf_init(buffer, sizeof buffer);

ASSERT(req == &connect_req);
ASSERT(status == 0);

uv_write(&write_req, req->handle, &buf, 1, (uv_write_cb) fail_cb);
uv_unref(uv_default_loop()); /* uv_write refs the loop */
}



static void shutdown_unref_cb(uv_connect_t* req, int status) {
ASSERT(req == &connect_req);
ASSERT(status == 0);

uv_shutdown(&shutdown_req, req->handle, (uv_shutdown_cb) fail_cb);
uv_unref(uv_default_loop()); /* uv_shutdown refs the loop */
}


TEST_IMPL(ref) {
uv_run(uv_default_loop());
return 0;
@@ -142,17 +170,38 @@ TEST_IMPL(tcp_ref2) {

TEST_IMPL(tcp_ref3) {
struct sockaddr_in addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
uv_connect_t req;
uv_tcp_t h;
uv_tcp_init(uv_default_loop(), &h);
uv_tcp_connect(&req, &h, addr, (uv_connect_cb)fail_cb);
uv_tcp_connect(&connect_req, &h, addr, (uv_connect_cb)fail_cb);
uv_unref(uv_default_loop());
uv_unref(uv_default_loop()); /* connect req refs the loop */
uv_run(uv_default_loop());
return 0;
}


TEST_IMPL(tcp_ref4) {
struct sockaddr_in addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
uv_tcp_t h;
uv_tcp_init(uv_default_loop(), &h);
uv_tcp_connect(&connect_req, &h, addr, write_unref_cb);
uv_unref(uv_default_loop());
uv_run(uv_default_loop());
return 0;
}


TEST_IMPL(tcp_ref5) {
struct sockaddr_in addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
uv_tcp_t h;
uv_tcp_init(uv_default_loop(), &h);
uv_tcp_connect(&connect_req, &h, addr, shutdown_unref_cb);
uv_unref(uv_default_loop());
uv_run(uv_default_loop());
return 0;
}


TEST_IMPL(udp_ref) {
uv_udp_t h;
uv_udp_init(uv_default_loop(), &h);
@@ -210,17 +259,36 @@ TEST_IMPL(pipe_ref2) {


TEST_IMPL(pipe_ref3) {
uv_connect_t req;
uv_pipe_t h;
uv_pipe_init(uv_default_loop(), &h, 0);
uv_pipe_connect(&req, &h, TEST_PIPENAME, (uv_connect_cb)fail_cb);
uv_pipe_connect(&connect_req, &h, TEST_PIPENAME, (uv_connect_cb)fail_cb);
uv_unref(uv_default_loop());
uv_unref(uv_default_loop()); /* connect req refs the loop */
uv_run(uv_default_loop());
return 0;
}


TEST_IMPL(pipe_ref4) {
uv_pipe_t h;
uv_pipe_init(uv_default_loop(), &h, 0);
uv_pipe_connect(&connect_req, &h, TEST_PIPENAME, write_unref_cb);
uv_unref(uv_default_loop());
uv_run(uv_default_loop());
return 0;
}


TEST_IMPL(pipe_ref5) {
uv_pipe_t h;
uv_pipe_init(uv_default_loop(), &h, 0);
uv_pipe_connect(&connect_req, &h, TEST_PIPENAME, shutdown_unref_cb);
uv_unref(uv_default_loop());
uv_run(uv_default_loop());
return 0;
}


TEST_IMPL(process_ref) {
/* spawn_helper4 blocks indefinitely. */
char *argv[] = { NULL, "spawn_helper4", NULL };
@@ -0,0 +1,101 @@
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/

/*
* These tests verify that the uv_shutdown callback is always made, even when
* it is immediately followed by an uv_close call.
*/

#include "uv.h"
#include "task.h"


static uv_shutdown_t shutdown_req;
static uv_connect_t connect_req;

static int connect_cb_called = 0;
static int shutdown_cb_called = 0;
static int close_cb_called = 0;


static void shutdown_cb(uv_shutdown_t* req, int status) {
ASSERT(req == &shutdown_req);
ASSERT(status == 0 ||
(status == -1 && uv_last_error(uv_default_loop()).code == UV_EINTR));
shutdown_cb_called++;
}


static void close_cb(uv_handle_t* handle) {
close_cb_called++;
}


static void connect_cb(uv_connect_t* req, int status) {
int r;

ASSERT(req == &connect_req);
ASSERT(status == 0);

r = uv_shutdown(&shutdown_req, req->handle, shutdown_cb);
ASSERT(r == 0);
uv_close((uv_handle_t*) req->handle, close_cb);

connect_cb_called++;
}


TEST_IMPL(shutdown_close_tcp) {
struct sockaddr_in addr = uv_ip4_addr("127.0.0.1", TEST_PORT);
uv_tcp_t h;
int r;

r = uv_tcp_init(uv_default_loop(), &h);
ASSERT(r == 0);
r = uv_tcp_connect(&connect_req, &h, addr, connect_cb);
ASSERT(r == 0);
r = uv_run(uv_default_loop());
ASSERT(r == 0);

ASSERT(connect_cb_called == 1);
ASSERT(shutdown_cb_called == 1);
ASSERT(close_cb_called == 1);

return 0;
}


TEST_IMPL(shutdown_close_pipe) {
uv_pipe_t h;
int r;

r = uv_pipe_init(uv_default_loop(), &h, 0);
ASSERT(r == 0);
uv_pipe_connect(&connect_req, &h, TEST_PIPENAME, connect_cb);
r = uv_run(uv_default_loop());
ASSERT(r == 0);

ASSERT(connect_cb_called == 1);
ASSERT(shutdown_cb_called == 1);
ASSERT(close_cb_called == 1);

return 0;
}
@@ -22,23 +22,64 @@
#include "uv.h"
#include "task.h"

#ifdef _WIN32
# include <io.h>
# include <windows.h>
#else /* Unix */
# include <fcntl.h>
# include <unistd.h>
#endif


TEST_IMPL(tty) {
int r, width, height;
uv_tty_t tty;
int ttyin_fd, ttyout_fd;
uv_tty_t tty_in, tty_out;
uv_loop_t* loop = uv_default_loop();

/* Make sure we have an FD that refers to a tty */
#ifdef _WIN32
HANDLE handle;
handle = CreateFileA("conin$",
GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,
NULL);
ASSERT(handle != INVALID_HANDLE_VALUE);
ttyin_fd = _open_osfhandle((intptr_t) handle, 0);

handle = CreateFileA("conout$",
GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,
NULL);
ASSERT(handle != INVALID_HANDLE_VALUE);
ttyout_fd = _open_osfhandle((intptr_t) handle, 0);

#else /* unix */
ttyin_fd = open("/dev/tty", O_RDONLY, 0);
ttyout_fd = open("/dev/tty", O_WRONLY, 0);
#endif

ASSERT(ttyin_fd >= 0);
ASSERT(ttyout_fd >= 0);

ASSERT(UV_UNKNOWN_HANDLE == uv_guess_handle(-1));

/*
* Not necessarily a problem if this assert goes off. E.G you are piping
* this test to a file. 0 == stdin.
*/
ASSERT(UV_TTY == uv_guess_handle(0));
ASSERT(UV_TTY == uv_guess_handle(ttyin_fd));
ASSERT(UV_TTY == uv_guess_handle(ttyout_fd));

r = uv_tty_init(uv_default_loop(), &tty_in, ttyin_fd, 1);
ASSERT(r == 0);

r = uv_tty_init(uv_default_loop(), &tty, 0, 1);
r = uv_tty_init(uv_default_loop(), &tty_out, ttyout_fd, 2);
ASSERT(r == 0);

r = uv_tty_get_winsize(&tty, &width, &height);
r = uv_tty_get_winsize(&tty_out, &width, &height);
ASSERT(r == 0);

printf("width=%d height=%d\n", width, height);
@@ -51,16 +92,17 @@ TEST_IMPL(tty) {
ASSERT(height > 10);

/* Turn on raw mode. */
r = uv_tty_set_mode(&tty, 1);
r = uv_tty_set_mode(&tty_in, 1);
ASSERT(r == 0);

/* Turn off raw mode. */
r = uv_tty_set_mode(&tty, 0);
r = uv_tty_set_mode(&tty_in, 0);
ASSERT(r == 0);

/* TODO check the actual mode! */

uv_close((uv_handle_t*)&tty, NULL);
uv_close((uv_handle_t*) &tty_in, NULL);
uv_close((uv_handle_t*) &tty_out, NULL);

uv_run(loop);

@@ -309,6 +309,7 @@
'test/test-hrtime.c',
'test/test-idle.c',
'test/test-ipc.c',
'test/test-ipc-send-recv.c',
'test/test-list.h',
'test/test-loop-handles.c',
'test/test-multiple-listen.c',
@@ -319,6 +320,7 @@
'test/test-platform-output.c',
'test/test-process-title.c',
'test/test-ref.c',
'test/test-shutdown-close.c',
'test/test-shutdown-eof.c',
'test/test-spawn.c',
'test/test-stdio-over-pipes.c',