Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

@@ -1,5 +1,5 @@
{
"version": "1.1.62",
"version": "1.1.64",
"name": "npm",
"publishConfig": {
"proprietary-attribs": false
@@ -15,7 +15,7 @@
"config": {
"publishtest": false
},
"homepage": "http://npmjs.org/",
"homepage": "https://npmjs.org/doc/",
"author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
"repository": {
"type": "git",
@@ -34,8 +34,8 @@
"main": "./lib/npm.js",
"bin": "./bin/npm-cli.js",
"dependencies": {
"semver": "~1.0.14",
"ini": "1",
"semver": "~1.1.0",
"ini": "~1.0.5",
"slide": "1",
"abbrev": "1",
"graceful-fs": "~1.1.1",
@@ -51,22 +51,21 @@
"mkdirp": "~0.3.3",
"read": "~1.0.4",
"lru-cache": "~2.0.0",
"node-gyp": "~0.6.4",
"fstream-npm": "0.1",
"node-gyp": "~0.7.1",
"fstream-npm": "~0.1.3",
"uid-number": "0",
"archy": "0",
"chownr": "0",
"npmlog": "0",
"ansi": "~0.1.2",
"npm-registry-client": "~0.2.6",
"read-package-json": "~0.1.3",
"read-installed": "0",
"glob": "~3.1.12",
"init-package-json": "0",
"npm-registry-client": "~0.2.9",
"read-package-json": "~0.1.8",
"read-installed": "0.0.3",
"glob": "~3.1.14",
"init-package-json": "0.0.6",
"osenv": "0",
"lockfile": ">=0.2",
"retry": "~0.6.0",
"couch-login": "~0.1.9",
"once": "~1.1.1",
"npmconf": "0",
"opener": "~1.3.0"
@@ -104,7 +103,6 @@
"osenv",
"lockfile",
"retry",
"couch-login",
"once",
"npmconf",
"opener"
@@ -126,7 +124,7 @@
"licenses": [
{
"type": "MIT +no-false-attribs",
"url": "http://github.com/isaacs/npm/raw/master/LICENSE"
"url": "https://github.com/isaacs/npm/raw/master/LICENSE"
}
]
}
@@ -17,7 +17,7 @@ if [ "x$0" = "xsh" ]; then
# on some systems, you can just do cat>npm-install.sh
# which is a bit cuter. But on others, &1 is already closed,
# so catting to another script file won't do anything.
curl -s http://npmjs.org/install.sh > npm-install-$$.sh
curl -s https://npmjs.org/install.sh > npm-install-$$.sh
sh npm-install-$$.sh
ret=$?
rm npm-install-$$.sh
@@ -1,4 +1,5 @@
{ "name":"npm-test-blerg"
, "version" : "0.0.0"
, "scripts" : { "test" : "node test.js" }
, "publishConfig": {"tag": "foo"}
}
@@ -1,4 +1,7 @@
{ "name":"npm-test-url-dep"
, "version" : "1.2.3"
, "dependencies" :
{ "dnode" : "https://github.com/substack/dnode/tarball/master" } }
{ "dnode" : "https://github.com/substack/jsonify/tarball/master"
, "sax": "isaacs/sax-js"
, "canonical-host": "git://github.com/isaacs/canonical-host"
} }
@@ -21,7 +21,6 @@
'OPENSSL_NO_RDRAND',
'OPENSSL_NO_GOST',
'OPENSSL_NO_HW_PADLOCK',
'OPENSSL_NO_TTY',
],
'sources': [
'openssl/ssl/bio_ssl.c',
@@ -576,7 +575,6 @@
'openssl/crypto/ts/ts_verify_ctx.c',
'openssl/crypto/txt_db/txt_db.c',
'openssl/crypto/ui/ui_compat.c',
'openssl/crypto/ui/ui_dummy.c',
'openssl/crypto/ui/ui_err.c',
'openssl/crypto/ui/ui_lib.c',
'openssl/crypto/ui/ui_openssl.c',

This file was deleted.

@@ -114,7 +114,6 @@
* [including the GNU Public Licence.]
*/

#ifndef OPENSSL_NO_TTY

#include <openssl/e_os2.h>

@@ -711,5 +710,3 @@ static int noecho_fgets(char *buf, int size, FILE *tty)
return(strlen(buf));
}
#endif

#endif
@@ -15,7 +15,7 @@
'configurations': {
'Debug': {
'defines': [ 'DEBUG', '_DEBUG' ],
'cflags': [ '-g', '-O0' ],
'cflags': [ '-g', '-O0', '-fwrapv' ],
'msvs_settings': {
'VCCLCompilerTool': {
'target_conditions': [
@@ -156,7 +156,8 @@ typedef struct {
struct uv_timer_s* rbh_root; \
} timer_handles; \
uint64_t time; \
void* signal_ctx; \
int signal_pipefd[2]; \
uv__io_t signal_io_watcher; \
uv_signal_t child_watcher; \
int emfile_fd; \
UV_PLATFORM_LOOP_FIELDS \
@@ -242,7 +243,7 @@ typedef struct {
ngx_queue_t queue;

#define UV_TIMER_PRIVATE_FIELDS \
/* RB_ENTRY(uv_timer_s) node; */ \
/* RB_ENTRY(uv_timer_s) tree_entry; */ \
struct { \
struct uv_timer_s* rbe_left; \
struct uv_timer_s* rbe_right; \
@@ -289,7 +290,16 @@ typedef struct {
int mode;

#define UV_SIGNAL_PRIVATE_FIELDS \
ngx_queue_t queue;
/* RB_ENTRY(uv_signal_s) tree_entry; */ \
struct { \
struct uv_signal_s* rbe_left; \
struct uv_signal_s* rbe_right; \
struct uv_signal_s* rbe_parent; \
int rbe_color; \
} tree_entry; \
/* Use two counters here so we don have to fiddle with atomics. */ \
unsigned int caught_signals; \
unsigned int dispatched_signals;

#define UV_FS_EVENT_PRIVATE_FIELDS \
uv_fs_event_cb cb; \
@@ -30,7 +30,6 @@ static int uv__async_init(uv_loop_t* loop);
static void uv__async_io(uv_loop_t* loop, uv__io_t* handle, int events);


__attribute__((always_inline))
static int uv__async_make_pending(volatile sig_atomic_t* ptr) {
/* Do a cheap read first. */
if (*ptr)
@@ -65,6 +65,9 @@ static uv_loop_t* default_loop_ptr;


void uv_close(uv_handle_t* handle, uv_close_cb close_cb) {
assert(!(handle->flags & (UV_CLOSING | UV_CLOSED)));

handle->flags |= UV_CLOSING;
handle->close_cb = close_cb;

switch (handle->type) {
@@ -121,15 +124,22 @@ void uv_close(uv_handle_t* handle, uv_close_cb close_cb) {
break;

case UV_SIGNAL:
uv__signal_close((uv_signal_t*)handle);
break;
uv__signal_close((uv_signal_t*) handle);
/* Signal handles may not be closed immediately. The signal code will */
/* itself close uv__make_close_pending whenever appropriate. */
return;

default:
assert(0);
}

handle->flags |= UV_CLOSING;
uv__make_close_pending(handle);
}


void uv__make_close_pending(uv_handle_t* handle) {
assert(handle->flags & UV_CLOSING);
assert(!(handle->flags & UV_CLOSED));
handle->next_closing = handle->loop->closing_handles;
handle->loop->closing_handles = handle;
}
@@ -101,7 +101,6 @@ enum {
};

__attribute__((unused))
__attribute__((always_inline))
static void uv__req_init(uv_loop_t* loop, uv_req_t* req, uv_req_type type) {
req->type = type;
uv__req_register(loop, req);
@@ -116,6 +115,7 @@ int uv__cloexec(int fd, int set);
int uv__socket(int domain, int type, int protocol);
int uv__dup(int fd);
int uv_async_stop(uv_async_t* handle);
void uv__make_close_pending(uv_handle_t* handle);

void uv__io_init(uv__io_t* handle, uv__io_cb cb, int fd, int events);
void uv__io_set(uv__io_t* handle, uv__io_cb cb, int fd, int events);
@@ -157,7 +157,8 @@ unsigned int uv__next_timeout(uv_loop_t* loop);

/* signal */
void uv__signal_close(uv_signal_t* handle);
void uv__signal_unregister(uv_loop_t* loop);
void uv__signal_global_once_init(void);
void uv__signal_loop_cleanup();

/* thread pool */
void uv__work_submit(uv_loop_t* loop,
@@ -31,6 +31,8 @@ int uv__loop_init(uv_loop_t* loop, int default_loop) {
unsigned int i;
int flags;

uv__signal_global_once_init();

#if HAVE_KQUEUE
flags = EVBACKEND_KQUEUE;
#else
@@ -47,10 +49,11 @@ int uv__loop_init(uv_loop_t* loop, int default_loop) {
ngx_queue_init(&loop->prepare_handles);
ngx_queue_init(&loop->handle_queue);
loop->closing_handles = NULL;
loop->signal_ctx = NULL;
loop->time = uv_hrtime() / 1000000;
loop->async_pipefd[0] = -1;
loop->async_pipefd[1] = -1;
loop->signal_pipefd[0] = -1;
loop->signal_pipefd[1] = -1;
loop->emfile_fd = -1;
loop->ev = (default_loop ? ev_default_loop : ev_loop_new)(flags);
ev_set_userdata(loop->ev, loop);
@@ -79,8 +82,8 @@ int uv__loop_init(uv_loop_t* loop, int default_loop) {


void uv__loop_delete(uv_loop_t* loop) {
uv__signal_loop_cleanup(loop);
uv__platform_loop_delete(loop);
uv__signal_unregister(loop);
ev_loop_destroy(loop->ev);

if (loop->async_pipefd[0] != -1) {

Large diffs are not rendered by default.

@@ -73,6 +73,8 @@ static int test_async_pummel(int nthreads) {
fmt(callbacks / (time / 1e9)));

free(tids);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -113,6 +113,7 @@ static int test_async(int nthreads) {

free(threads);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -131,5 +131,6 @@ BENCHMARK_IMPL(fs_stat) {
warmup(path);
sync_bench(path);
async_bench(path);
MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -90,5 +90,6 @@ BENCHMARK_IMPL(getaddrinfo) {
LOGF("getaddrinfo: %.0f req/s\n",
(double) calls_completed / (double) (end_time - start_time) * 1000.0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -67,6 +67,7 @@ BENCHMARK_IMPL(loop_count) {
ns / 1e9,
NUM_TICKS / (ns / 1e9));

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -84,5 +85,6 @@ BENCHMARK_IMPL(loop_count_timed) {

LOGF("loop_count: %lu ticks (%.0f ticks/s)\n", ticks, ticks / 5.0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -61,5 +61,6 @@ BENCHMARK_IMPL(million_timers) {

LOGF("%.2f seconds\n", (after - before) / 1e9);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -416,6 +416,7 @@ static int test_tcp(unsigned int num_servers, unsigned int num_clients) {
free(clients);
free(servers);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -209,5 +209,6 @@ BENCHMARK_IMPL(ping_pongs) {

ASSERT(completed_pingers == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -300,6 +300,7 @@ static int pound_it(int concurrency,
closed_streams / secs,
conns_failed);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -404,6 +404,7 @@ HELPER_IMPL(pipe_pump_server) {

uv_run(loop);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -421,6 +422,8 @@ void tcp_pump(int n) {
maybe_connect_some();

uv_run(loop);

MAKE_VALGRIND_HAPPY();
}


@@ -435,6 +438,8 @@ void pipe_pump(int n) {
maybe_connect_some();

uv_run(loop);

MAKE_VALGRIND_HAPPY();
}


@@ -158,5 +158,6 @@ BENCHMARK_IMPL(spawn) {
LOGF("spawn: %.0f spawns/s\n",
(double) N / (double) (end_time - start_time) * 1000.0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -134,7 +134,8 @@ BENCHMARK_IMPL(tcp_write_batch) {

printf("%ld write requests in %.2fs.\n",
(long)NUM_WRITE_REQS,
(stop - start) / 10e8);
(stop - start) / 1e9);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -43,7 +43,8 @@ struct receiver_state {
uv_udp_t udp_handle;
};

static unsigned int packet_counter = 1e6; /* not used in timed mode */
/* not used in timed mode */
static unsigned int packet_counter = (unsigned int) 1e6;

static int n_senders_;
static int n_receivers_;
@@ -190,7 +191,8 @@ static int do_packet_storm(int n_senders,
duration = uv_hrtime();
ASSERT(0 == uv_run(loop));
duration = uv_hrtime() - duration;
duration = duration / 1e6; /* convert from nanoseconds to milliseconds */
/* convert from nanoseconds to milliseconds */
duration = duration / (uint64_t) 1e6;

printf("udp_packet_storm_%dv%d: %.0f/s received, %.0f/s sent. "
"%u received, %u sent in %.1f seconds.\n",
@@ -202,6 +204,7 @@ static int do_packet_storm(int n_senders,
send_cb_called,
duration / 1000.0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -300,7 +300,6 @@ int run_test_part(const char* test, const char* part) {
if (strcmp(test, task->task_name) == 0 &&
strcmp(part, task->process_name) == 0) {
r = task->main();
uv_loop_delete(uv_default_loop());
return r;
}
}
@@ -91,6 +91,11 @@ typedef enum {
} \
} while (0)

/* This macro cleans up the main loop. This is used to avoid valgrind
* warnings about memory being "leaked" by the main event loop.
*/
#define MAKE_VALGRIND_HAPPY() \
uv_loop_delete(uv_default_loop())

/* Just sugar for wrapping the main() for a task or helper. */
#define TEST_IMPL(name) \
@@ -78,5 +78,6 @@ TEST_IMPL(active) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -116,5 +116,6 @@ TEST_IMPL(async) {

ASSERT(0 == uv_thread_join(&thread));

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -72,5 +72,6 @@ TEST_IMPL(callback_order) {
ASSERT(idle_cb_called == 1);
ASSERT(timer_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -199,5 +199,6 @@ TEST_IMPL(callback_stack) {
ASSERT(shutdown_cb_called == 1 && "shutdown_cb must be called exactly once");
ASSERT(close_cb_called == 2 && "close_cb must be called exactly twice");

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -124,6 +124,7 @@ TEST_IMPL(connection_fail) {
ASSERT(timer_close_cb_calls == 0);
ASSERT(timer_cb_calls == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -144,5 +145,6 @@ TEST_IMPL(connection_fail_doesnt_auto_close) {
ASSERT(timer_close_cb_calls == 1);
ASSERT(timer_cb_calls == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -184,5 +184,6 @@ TEST_IMPL(delayed_accept) {
ASSERT(connect_cb_called == 2);
ASSERT(close_cb_called == 7);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -201,6 +201,7 @@ TEST_IMPL(fs_event_watch_dir) {
remove("watch_dir/file1");
remove("watch_dir/");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -234,6 +235,7 @@ TEST_IMPL(fs_event_watch_file) {
remove("watch_dir/file1");
remove("watch_dir/");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -252,6 +254,7 @@ TEST_IMPL(fs_event_watch_file_twice) {
ASSERT(0 == uv_timer_start(&timer, timer_cb_watch_twice, 10, 0));
ASSERT(0 == uv_run(loop));

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -289,6 +292,7 @@ TEST_IMPL(fs_event_watch_file_current_dir) {
/* Cleanup */
remove("watch_file");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -321,6 +325,7 @@ TEST_IMPL(fs_event_no_callback_on_close) {
remove("watch_dir/file1");
remove("watch_dir/");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -361,6 +366,7 @@ TEST_IMPL(fs_event_immediate_close) {

ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -390,6 +396,7 @@ TEST_IMPL(fs_event_close_with_pending_event) {
remove("watch_dir/file");
remove("watch_dir/");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -455,6 +462,7 @@ TEST_IMPL(fs_event_close_in_callback) {
remove("watch_dir/file5");
remove("watch_dir/");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -141,5 +141,6 @@ TEST_IMPL(fs_poll) {
ASSERT(timer_cb_called == 2);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -482,6 +482,7 @@ TEST_IMPL(fs_file_noent) {

/* TODO add EACCES test */

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -508,6 +509,7 @@ TEST_IMPL(fs_file_nametoolong) {
uv_run(loop);
ASSERT(open_cb_count == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -536,6 +538,7 @@ TEST_IMPL(fs_file_loop) {

unlink("test_symlink");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -653,6 +656,7 @@ TEST_IMPL(fs_file_async) {
unlink("test_file");
unlink("test_file2");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -737,6 +741,7 @@ TEST_IMPL(fs_file_sync) {
unlink("test_file");
unlink("test_file2");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -828,6 +833,7 @@ TEST_IMPL(fs_async_dir) {
unlink("test_dir/file2");
rmdir("test_dir");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -891,6 +897,7 @@ TEST_IMPL(fs_async_sendfile) {
unlink("test_file");
unlink("test_file2");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -946,6 +953,7 @@ TEST_IMPL(fs_fstat) {
/* Cleanup. */
unlink("test_file");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1042,6 +1050,7 @@ TEST_IMPL(fs_chmod) {
/* Cleanup. */
unlink("test_file");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1104,6 +1113,7 @@ TEST_IMPL(fs_chown) {
/* Cleanup. */
unlink("test_file");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1186,6 +1196,7 @@ TEST_IMPL(fs_link) {
unlink("test_file_link");
unlink("test_file_link2");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1208,6 +1219,7 @@ TEST_IMPL(fs_readlink) {
ASSERT(req.errorno == UV_ENOENT);
uv_fs_req_cleanup(&req);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1329,6 +1341,7 @@ TEST_IMPL(fs_symlink) {
unlink("test_file_symlink2");
unlink("test_file_symlink2_symlink");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1440,6 +1453,7 @@ TEST_IMPL(fs_symlink_dir) {
rmdir("test_dir");
rmdir("test_dir_symlink");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1490,6 +1504,7 @@ TEST_IMPL(fs_utime) {
/* Cleanup. */
unlink(path);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1521,6 +1536,7 @@ TEST_IMPL(fs_stat_root) {
r = uv_fs_stat(loop, &stat_req, "\\\\?\\C:\\", NULL);
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
#endif
@@ -1580,6 +1596,7 @@ TEST_IMPL(fs_futime) {
/* Cleanup. */
unlink(path);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1596,6 +1613,7 @@ TEST_IMPL(fs_stat_missing_path) {
ASSERT(uv_last_error(loop).code == UV_ENOENT);
uv_fs_req_cleanup(&req);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1627,6 +1645,7 @@ TEST_IMPL(fs_readdir_empty_dir) {
uv_fs_rmdir(loop, &req, path, NULL);
uv_fs_req_cleanup(&req);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1650,6 +1669,7 @@ TEST_IMPL(fs_readdir_file) {
uv_run(loop);
ASSERT(readdir_cb_count == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1679,6 +1699,7 @@ TEST_IMPL(fs_open_dir) {
uv_run(loop);
ASSERT(open_cb_count == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1747,6 +1768,7 @@ TEST_IMPL(fs_file_open_append) {
/* Cleanup */
unlink("test_file");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1815,6 +1837,7 @@ TEST_IMPL(fs_rename_to_existing_file) {
unlink("test_file");
unlink("test_file2");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -1871,5 +1894,6 @@ TEST_IMPL(fs_read_file_eof) {
/* Cleanup */
unlink("test_file");

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -88,6 +88,7 @@ TEST_IMPL(getaddrinfo_basic) {

ASSERT(getaddrinfo_cbs == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -118,5 +119,6 @@ TEST_IMPL(getaddrinfo_concurrent) {
ASSERT(callback_counts[i] == 1);
}

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -322,6 +322,7 @@ TEST_IMPL(getsockname_tcp) {
ASSERT(getsocknamecount == 3);
ASSERT(getpeernamecount == 3);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -338,5 +339,6 @@ TEST_IMPL(getsockname_udp) {

ASSERT(getsocknamecount == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -77,5 +77,6 @@ TEST_IMPL(idle_starvation) {
ASSERT(timer_cb_called == 1);
ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -123,7 +123,11 @@ TEST_IMPL(ipc_send_recv_pipe) {
r = uv_pipe_bind(&ctx.send.pipe, TEST_PIPENAME);
ASSERT(r == 0);

return run_test();
r = run_test();
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}


@@ -138,7 +142,11 @@ TEST_IMPL(ipc_send_recv_tcp) {
r = uv_tcp_bind(&ctx.send.tcp, uv_ip4_addr("127.0.0.1", TEST_PORT));
ASSERT(r == 0);

return run_test();
r = run_test();
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}


@@ -205,5 +213,6 @@ int ipc_send_recv_helper(void) {
r = uv_run(uv_default_loop());
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -321,6 +321,7 @@ static int run_ipc_test(const char* helper, uv_read2_cb read_cb) {
r = uv_run(uv_default_loop());
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -374,6 +375,7 @@ TEST_IMPL(listen_with_simultaneous_accepts) {
ASSERT(r == 0);
ASSERT(server.reqs_pending == 32);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -396,6 +398,7 @@ TEST_IMPL(listen_no_simultaneous_accepts) {
ASSERT(r == 0);
ASSERT(server.reqs_pending == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
#endif
@@ -570,6 +573,7 @@ int ipc_helper(int listen_after_write) {
ASSERT(connection_accepted == 1);
ASSERT(close_cb_called == 3);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -616,5 +620,6 @@ int ipc_helper_tcp_connection() {
ASSERT(tcp_conn_write_cb_called == 1);
ASSERT(close_cb_called == 4);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -192,8 +192,6 @@ TEST_DECLARE (dlerror)
TEST_DECLARE (poll_duplex)
TEST_DECLARE (poll_unidirectional)
TEST_DECLARE (poll_close)
TEST_DECLARE (we_get_signal)
TEST_DECLARE (we_get_signals)
#ifdef _WIN32
TEST_DECLARE (spawn_detect_pipe_name_collisions_on_windows)
TEST_DECLARE (argument_escaping)
@@ -203,6 +201,9 @@ TEST_DECLARE (listen_no_simultaneous_accepts)
TEST_DECLARE (fs_stat_root)
#else
TEST_DECLARE (spawn_setuid_setgid)
TEST_DECLARE (we_get_signal)
TEST_DECLARE (we_get_signals)
TEST_DECLARE (signal_multiple_loops)
#endif
HELPER_DECLARE (tcp4_echo_server)
HELPER_DECLARE (tcp6_echo_server)
@@ -398,9 +399,6 @@ TASK_LIST_START
TEST_ENTRY (fs_poll)
TEST_ENTRY (kill)

TEST_ENTRY (we_get_signal)
TEST_ENTRY (we_get_signals)

#ifdef _WIN32
TEST_ENTRY (spawn_detect_pipe_name_collisions_on_windows)
TEST_ENTRY (argument_escaping)
@@ -410,6 +408,9 @@ TASK_LIST_START
TEST_ENTRY (fs_stat_root)
#else
TEST_ENTRY (spawn_setuid_setgid)
TEST_ENTRY (we_get_signal)
TEST_ENTRY (we_get_signals)
TEST_ENTRY (signal_multiple_loops)
#endif

TEST_ENTRY (fs_file_noent)
@@ -332,5 +332,6 @@ TEST_IMPL(loop_handles) {
ASSERT(idle_2_close_cb_called == idle_2_cb_started);
ASSERT(idle_2_is_active == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -98,5 +98,6 @@ TEST_IMPL(multiple_listen) {
ASSERT(connect_cb_called == 1);
ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -228,6 +228,7 @@ TEST_IMPL(tcp_ping_pong) {

ASSERT(completed_pingers == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -238,6 +239,7 @@ TEST_IMPL(tcp_ping_pong_v6) {

ASSERT(completed_pingers == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -248,5 +250,6 @@ TEST_IMPL(pipe_ping_pong) {

ASSERT(completed_pingers == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -71,6 +71,7 @@ TEST_IMPL(pipe_bind_error_addrinuse) {

ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -92,6 +93,7 @@ TEST_IMPL(pipe_bind_error_addrnotavail) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -115,6 +117,7 @@ TEST_IMPL(pipe_bind_error_inval) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -136,5 +139,6 @@ TEST_IMPL(pipe_listen_without_bind) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -73,6 +73,7 @@ TEST_IMPL(pipe_connect_bad_name) {
ASSERT(close_cb_called == 1);
ASSERT(connect_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -92,5 +93,6 @@ TEST_IMPL(pipe_connect_to_file) {
ASSERT(close_cb_called == 1);
ASSERT(connect_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -68,5 +68,6 @@ TEST_IMPL(poll_close) {

ASSERT(close_cb_called == NUM_SOCKETS);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -556,6 +556,8 @@ static void start_poll_test() {
spurious_writable_wakeups > 20);

ASSERT(closed_connections == NUM_CLIENTS * 2);

MAKE_VALGRIND_HAPPY();
}


@@ -96,6 +96,7 @@ static void connect_and_shutdown(uv_connect_t* req, int status) {

TEST_IMPL(ref) {
uv_run(uv_default_loop());
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -107,6 +108,7 @@ TEST_IMPL(idle_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -117,6 +119,7 @@ TEST_IMPL(async_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -128,6 +131,7 @@ TEST_IMPL(prepare_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -139,6 +143,7 @@ TEST_IMPL(check_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -156,6 +161,7 @@ TEST_IMPL(unref_in_prepare_cb) {
uv_prepare_start(&h, prepare_cb);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -166,6 +172,7 @@ TEST_IMPL(timer_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -177,6 +184,7 @@ TEST_IMPL(timer_ref2) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -187,6 +195,7 @@ TEST_IMPL(fs_event_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -198,6 +207,7 @@ TEST_IMPL(fs_poll_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -208,6 +218,7 @@ TEST_IMPL(tcp_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -219,6 +230,7 @@ TEST_IMPL(tcp_ref2) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -233,6 +245,7 @@ TEST_IMPL(tcp_ref3) {
ASSERT(connect_cb_called == 1);
ASSERT(shutdown_cb_called == 1);
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -248,6 +261,7 @@ TEST_IMPL(tcp_ref4) {
ASSERT(write_cb_called == 1);
ASSERT(shutdown_cb_called == 1);
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -258,6 +272,7 @@ TEST_IMPL(udp_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -271,6 +286,7 @@ TEST_IMPL(udp_ref2) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -288,6 +304,7 @@ TEST_IMPL(udp_ref3) {
ASSERT(req_cb_called == 1);
do_close(&h);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -298,6 +315,7 @@ TEST_IMPL(pipe_ref) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -309,6 +327,7 @@ TEST_IMPL(pipe_ref2) {
uv_unref((uv_handle_t*)&h);
uv_run(uv_default_loop());
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -322,6 +341,7 @@ TEST_IMPL(pipe_ref3) {
ASSERT(connect_cb_called == 1);
ASSERT(shutdown_cb_called == 1);
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -336,6 +356,7 @@ TEST_IMPL(pipe_ref4) {
ASSERT(write_cb_called == 1);
ASSERT(shutdown_cb_called == 1);
do_close(&h);
MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -371,5 +392,6 @@ TEST_IMPL(process_ref) {

do_close(&h);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -44,5 +44,6 @@ TEST_IMPL(run_once) {
while (uv_run_once(uv_default_loop()));
ASSERT(idle_counter == NUM_TICKS);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -81,6 +81,7 @@ TEST_IMPL(shutdown_close_tcp) {
ASSERT(shutdown_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -99,5 +100,6 @@ TEST_IMPL(shutdown_close_pipe) {
ASSERT(shutdown_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -178,6 +178,7 @@ TEST_IMPL(shutdown_eof) {
ASSERT(called_timer_close_cb == 1);
ASSERT(called_timer_cb == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -0,0 +1,270 @@
/* 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.
*/


/* This test does not pretend to be cross-platform. */
#ifndef _WIN32

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

#include <errno.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>


#define NUM_SIGNAL_HANDLING_THREADS 25
#define NUM_LOOP_CREATING_THREADS 10


static uv_sem_t sem;
static uv_mutex_t counter_lock;
static volatile int stop = 0;

static volatile int signal1_cb_counter = 0;
static volatile int signal2_cb_counter = 0;
static volatile int loop_creation_counter = 0;


static void increment_counter(volatile int* counter) {
uv_mutex_lock(&counter_lock);
++(*counter);
uv_mutex_unlock(&counter_lock);
}


static void signal1_cb(uv_signal_t* handle, int signum) {
ASSERT(signum == SIGUSR1);
increment_counter(&signal1_cb_counter);
uv_signal_stop(handle);
}


static void signal2_cb(uv_signal_t* handle, int signum) {
ASSERT(signum == SIGUSR2);
increment_counter(&signal2_cb_counter);
uv_signal_stop(handle);
}


static void signal_handling_worker(void* context) {
uintptr_t mask = (uintptr_t) context;
uv_loop_t* loop;
uv_signal_t signal1a;
uv_signal_t signal1b;
uv_signal_t signal2;
int r;

loop = uv_loop_new();
ASSERT(loop != NULL);

/* Setup the signal watchers and start them. */
if (mask & SIGUSR1) {
r = uv_signal_init(loop, &signal1a);
ASSERT(r == 0);
r = uv_signal_start(&signal1a, signal1_cb, SIGUSR1);
ASSERT(r == 0);
r = uv_signal_init(loop, &signal1b);
ASSERT(r == 0);
r = uv_signal_start(&signal1b, signal1_cb, SIGUSR1);
ASSERT(r == 0);
}
if (mask & SIGUSR2) {
r = uv_signal_init(loop, &signal2);
ASSERT(r == 0);
r = uv_signal_start(&signal2, signal2_cb, SIGUSR2);
ASSERT(r == 0);
}

/* Signal watchers are now set up. */
uv_sem_post(&sem);

/* Wait for all signals. The signal callbacks stop the watcher, so uv_run
* will return when all signal watchers caught a signal.
*/
r = uv_run(loop);
ASSERT(r == 0);

/* Restart the signal watchers. */
if (mask & SIGUSR1) {
r = uv_signal_start(&signal1a, signal1_cb, SIGUSR1);
ASSERT(r == 0);
r = uv_signal_start(&signal1b, signal1_cb, SIGUSR1);
ASSERT(r == 0);
}
if (mask & SIGUSR2) {
r = uv_signal_start(&signal2, signal2_cb, SIGUSR2);
ASSERT(r == 0);
}

/* Wait for signals once more. */
uv_sem_post(&sem);

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

/* Close the watchers. */
if (mask & SIGUSR1) {
uv_close((uv_handle_t*) &signal1a, NULL);
uv_close((uv_handle_t*) &signal1b, NULL);
}
if (mask & SIGUSR2) {
uv_close((uv_handle_t*) &signal2, NULL);
}

/* Wait for the signal watchers to close. */
r = uv_run(loop);
ASSERT(r == 0);

uv_loop_delete(loop);
}


static void signal_unexpected_cb(uv_signal_t* handle, int signum) {
ASSERT(0 && "signal_unexpected_cb should never be called");
}


static void loop_creating_worker(void* context) {
(void) context;

do {
uv_loop_t* loop;
uv_signal_t signal;
int r;

loop = uv_loop_new();
ASSERT(loop != NULL);

r = uv_signal_init(loop, &signal);
ASSERT(r == 0);

r = uv_signal_start(&signal, signal_unexpected_cb, SIGTERM);
ASSERT(r == 0);

uv_close((uv_handle_t*) &signal, NULL);

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

uv_loop_delete(loop);

increment_counter(&loop_creation_counter);
} while (!stop);
}


TEST_IMPL(signal_multiple_loops) {
int i, r;
uv_thread_t loop_creating_threads[NUM_LOOP_CREATING_THREADS];
uv_thread_t signal_handling_threads[NUM_SIGNAL_HANDLING_THREADS];
sigset_t sigset;

r = uv_sem_init(&sem, 0);
ASSERT(r == 0);

r = uv_mutex_init(&counter_lock);
ASSERT(r == 0);

/* Create a couple of threads that create a destroy loops continuously. */
for (i = 0; i < NUM_LOOP_CREATING_THREADS; i++) {
r = uv_thread_create(&loop_creating_threads[i],
loop_creating_worker,
NULL);
ASSERT(r == 0);
}

/* Create a couple of threads that actually handle signals. */
for (i = 0; i < NUM_SIGNAL_HANDLING_THREADS; i++) {
uintptr_t mask;

switch (i % 3) {
case 0: mask = SIGUSR1; break;
case 1: mask = SIGUSR2; break;
case 2: mask = SIGUSR1 | SIGUSR2; break;
}

r = uv_thread_create(&signal_handling_threads[i],
signal_handling_worker,
(void*) mask);
ASSERT(r == 0);
}

/* Wait until all threads have started and set up their signal watchers. */
for (i = 0; i < NUM_SIGNAL_HANDLING_THREADS; i++)
uv_sem_wait(&sem);

r = kill(getpid(), SIGUSR1);
ASSERT(r == 0);
r = kill(getpid(), SIGUSR2);
ASSERT(r == 0);

/* Wait for all threads to handle these signals. */
for (i = 0; i < NUM_SIGNAL_HANDLING_THREADS; i++)
uv_sem_wait(&sem);

/* Block all signals to this thread, so we are sure that from here the signal
* handler runs in another thread. This is is more likely to catch thread and
* signal safety issues if there are any.
*/
sigfillset(&sigset);
pthread_sigmask(SIG_SETMASK, &sigset, NULL);

r = kill(getpid(), SIGUSR1);
ASSERT(r == 0);
r = kill(getpid(), SIGUSR2);
ASSERT(r == 0);

/* Wait for all signal handling threads to exit. */
for (i = 0; i < NUM_SIGNAL_HANDLING_THREADS; i++) {
r = uv_thread_join(&signal_handling_threads[i]);
ASSERT(r == 0);
}

/* Tell all loop creating threads to stop. */
stop = 1;

/* Wait for all loop creating threads to exit. */
for (i = 0; i < NUM_LOOP_CREATING_THREADS; i++) {
r = uv_thread_join(&loop_creating_threads[i]);
ASSERT(r == 0);
}

printf("signal1_cb calls: %d\n", signal1_cb_counter);
printf("signal2_cb calls: %d\n", signal2_cb_counter);
printf("loops created and destroyed: %d\n", loop_creation_counter);

ASSERT(signal1_cb_counter == 4 * NUM_SIGNAL_HANDLING_THREADS);
ASSERT(signal2_cb_counter == 2 * NUM_SIGNAL_HANDLING_THREADS);
/* We don't know exactly how much loops will be created and destroyed, but at
* least there should be 1 for every loop creating thread.
*/
ASSERT(loop_creation_counter >= NUM_LOOP_CREATING_THREADS);

MAKE_VALGRIND_HAPPY();
return 0;
}

#endif /* !_WIN32 */
@@ -19,31 +19,19 @@
* IN THE SOFTWARE.
*/

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

#ifdef _WIN32

TEST_IMPL(we_get_signal) {
return 0;
}


TEST_IMPL(we_get_signals) {
return 0;
}
/* This test does not pretend to be cross-platform. */
#ifndef _WIN32

#else /* !_WIN32 */
#include "uv.h"
#include "task.h"

#include <errno.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <errno.h>

/* This test does not pretend to be cross-platform. */
#include <pthread.h>
#include <signal.h>
#include <unistd.h>

#define NSIGNALS 10
@@ -131,6 +119,7 @@ TEST_IMPL(we_get_signal) {
ASSERT(tc.ncalls == NSIGNALS);
ASSERT(sc.ncalls == NSIGNALS);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -156,6 +145,7 @@ TEST_IMPL(we_get_signals) {
for (i = 0; i < ARRAY_SIZE(tc); i++)
ASSERT(tc[i].ncalls == NSIGNALS);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -152,6 +152,8 @@ TEST_IMPL(spawn_fails) {
ASSERT(0 != uv_is_active((uv_handle_t*)&process));
ASSERT(0 == uv_run(uv_default_loop()));
ASSERT(uv_last_error(uv_default_loop()).code == UV_ENOENT);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -170,6 +172,7 @@ TEST_IMPL(spawn_exit_code) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -202,6 +205,7 @@ TEST_IMPL(spawn_stdout) {
printf("output is: %s", output);
ASSERT(strcmp("hello world\n", output) == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -254,6 +258,7 @@ TEST_IMPL(spawn_stdout_to_file) {
/* Cleanup. */
unlink("stdout_file");

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -296,6 +301,7 @@ TEST_IMPL(spawn_stdin) {
ASSERT(close_cb_called == 3); /* Once for process twice for the pipe. */
ASSERT(strcmp(buffer, output) == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -330,6 +336,7 @@ TEST_IMPL(spawn_stdio_greater_than_3) {
printf("output from stdio[3] is: %s", output);
ASSERT(strcmp("fourth stdio!\n", output) == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -351,6 +358,7 @@ TEST_IMPL(spawn_ignored_stdio) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -375,6 +383,7 @@ TEST_IMPL(spawn_and_kill) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 2); /* Once for process and once for timer. */

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -402,6 +411,7 @@ TEST_IMPL(spawn_detached) {
err = uv_kill(process.pid, 15);
ASSERT(err.code == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -459,6 +469,7 @@ TEST_IMPL(spawn_and_kill_with_std) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 5); /* process x 1, timer x 1, stdio x 3. */

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -505,6 +516,7 @@ TEST_IMPL(spawn_and_ping) {
ASSERT(exit_cb_called == 1);
ASSERT(strcmp(output, "TEST") == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -538,6 +550,7 @@ TEST_IMPL(kill) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -585,6 +598,7 @@ TEST_IMPL(spawn_detect_pipe_name_collisions_on_windows) {
printf("output is: %s", output);
ASSERT(strcmp("hello world\n", output) == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -744,6 +758,7 @@ TEST_IMPL(spawn_setuid_setgid) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
#endif
@@ -777,6 +792,7 @@ TEST_IMPL(spawn_setuid_fails) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -808,6 +824,7 @@ TEST_IMPL(spawn_setgid_fails) {
ASSERT(exit_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
#endif
@@ -839,6 +856,7 @@ TEST_IMPL(spawn_setuid_fails) {

ASSERT(close_cb_called == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -860,6 +878,7 @@ TEST_IMPL(spawn_setgid_fails) {

ASSERT(close_cb_called == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
#endif
@@ -147,6 +147,7 @@ TEST_IMPL(stdio_over_pipes) {
ASSERT(memcmp("hello world\n", output, 12) == 0);
ASSERT(output_used == 12);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -242,5 +243,6 @@ int stdio_over_pipes_helper() {
ASSERT(on_pipe_read_called == 1);
ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -63,6 +63,7 @@ TEST_IMPL(tcp_bind_error_addrinuse) {

ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -87,6 +88,7 @@ TEST_IMPL(tcp_bind_error_addrnotavail_1) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -108,6 +110,7 @@ TEST_IMPL(tcp_bind_error_addrnotavail_2) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -133,6 +136,7 @@ TEST_IMPL(tcp_bind_error_fault) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -159,6 +163,7 @@ TEST_IMPL(tcp_bind_error_inval) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -174,6 +179,7 @@ TEST_IMPL(tcp_bind_localhost_ok) {
r = uv_tcp_bind(&server, addr);
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -187,5 +193,6 @@ TEST_IMPL(tcp_listen_without_bind) {
r = uv_listen((uv_stream_t*)&server, 128, NULL);
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -63,6 +63,7 @@ TEST_IMPL(tcp_bind6_error_addrinuse) {

ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -84,6 +85,7 @@ TEST_IMPL(tcp_bind6_error_addrnotavail) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -109,6 +111,7 @@ TEST_IMPL(tcp_bind6_error_fault) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -135,6 +138,7 @@ TEST_IMPL(tcp_bind6_error_inval) {

ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -150,5 +154,6 @@ TEST_IMPL(tcp_bind6_localhost_ok) {
r = uv_tcp_bind6(&server, addr);
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -76,5 +76,6 @@ TEST_IMPL(tcp_close_while_connecting) {
ASSERT(timer1_cb_called == 1);
ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -125,5 +125,6 @@ TEST_IMPL(tcp_close) {
ASSERT(write_cb_called == NUM_WRITE_REQS);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -91,5 +91,6 @@ TEST_IMPL(tcp_connect_error_after_write) {
ASSERT(write_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -66,5 +66,6 @@ TEST_IMPL(tcp_connect_error_fault) {
ASSERT(connect_cb_called == 0);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -81,5 +81,6 @@ TEST_IMPL(tcp_connect_timeout) {
r = uv_run(uv_default_loop());
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -64,5 +64,6 @@ TEST_IMPL(tcp_connect6_error_fault) {
ASSERT(connect_cb_called == 0);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -47,5 +47,6 @@ TEST_IMPL(tcp_flags) {
r = uv_run(loop);
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -50,7 +50,6 @@ static void startup(void) {

static uv_os_sock_t create_tcp_socket(void) {
uv_os_sock_t sock;
int r;

sock = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
#ifdef _WIN32
@@ -63,7 +62,7 @@ static uv_os_sock_t create_tcp_socket(void) {
{
/* Allow reuse of the port. */
int yes = 1;
r = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes);
int r = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes);
ASSERT(r == 0);
}
#endif
@@ -171,5 +170,6 @@ TEST_IMPL(tcp_open) {
ASSERT(write_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -127,5 +127,6 @@ TEST_IMPL(tcp_shutdown_after_write) {
ASSERT(conn_close_cb_called == 1);
ASSERT(timer_close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -109,5 +109,6 @@ TEST_IMPL(tcp_unexpected_read) {
*/
ASSERT(ticks <= 20);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -164,5 +164,6 @@ TEST_IMPL(tcp_write_error) {
ASSERT(write_cb_error_called >= 1);
ASSERT(tcp_client.write_queue_size == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -131,5 +131,6 @@ TEST_IMPL(tcp_write_to_half_open_connection) {
ASSERT(write_cb_called > 0);
ASSERT(read_cb_called > 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -166,5 +166,6 @@ TEST_IMPL(tcp_writealot) {

free(send_buffer);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -53,5 +53,6 @@ TEST_IMPL(threadpool_queue_work_simple) {
ASSERT(work_cb_count == 1);
ASSERT(after_work_cb_count == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -137,5 +137,6 @@ TEST_IMPL(timer_again) {
(long int)(uv_now(uv_default_loop()) - start_time));
ASSERT(700 <= uv_now(uv_default_loop()) - start_time);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -129,6 +129,7 @@ TEST_IMPL(timer) {

ASSERT(500 <= uv_now(uv_default_loop()) - start_time);

MAKE_VALGRIND_HAPPY();
return 0;
}

@@ -148,5 +149,6 @@ TEST_IMPL(timer_start_twice) {

ASSERT(once_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -106,5 +106,6 @@ TEST_IMPL(tty) {

uv_run(loop);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -82,5 +82,6 @@ TEST_IMPL(udp_dgram_too_big) {
ASSERT(send_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -133,6 +133,8 @@ static void do_test(uv_udp_recv_cb recv_cb, int bind_flags) {
uv_run(uv_default_loop());

ASSERT(close_cb_called == 3);

MAKE_VALGRIND_HAPPY();
}


@@ -135,5 +135,6 @@ TEST_IMPL(udp_multicast_join) {
ASSERT(sv_send_cb_called == 1);
ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -82,5 +82,6 @@ TEST_IMPL(udp_multicast_ttl) {
ASSERT(sv_send_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -46,7 +46,6 @@ static void startup(void) {

static uv_os_sock_t create_udp_socket(void) {
uv_os_sock_t sock;
int r;

sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
#ifdef _WIN32
@@ -59,7 +58,7 @@ static uv_os_sock_t create_udp_socket(void) {
{
/* Allow reuse of the port. */
int yes = 1;
r = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes);
int r = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof yes);
ASSERT(r == 0);
}
#endif
@@ -150,5 +149,6 @@ TEST_IMPL(udp_open) {
ASSERT(send_cb_called == 1);
ASSERT(close_cb_called == 1);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -82,5 +82,6 @@ TEST_IMPL(udp_options) {
r = uv_run(loop);
ASSERT(r == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -204,5 +204,6 @@ TEST_IMPL(udp_send_and_recv) {
ASSERT(sv_recv_cb_called == 1);
ASSERT(close_cb_called == 2);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -73,5 +73,6 @@ TEST_IMPL(walk_handles) {
uv_walk(loop, walk_cb, magic_cookie);
ASSERT(seen_timer_handle == 0);

MAKE_VALGRIND_HAPPY();
return 0;
}
@@ -283,6 +283,7 @@
'test/test-shutdown-close.c',
'test/test-shutdown-eof.c',
'test/test-signal.c',
'test/test-signal-multiple-loops.c',
'test/test-spawn.c',
'test/test-fs-poll.c',
'test/test-stdio-over-pipes.c',
@@ -303,7 +304,6 @@
'test/test-tcp-unexpected-read.c',
'test/test-threadpool.c',
'test/test-mutexes.c',
'test/test-signal.c',
'test/test-thread.c',
'test/test-barrier.c',
'test/test-condvar.c',
@@ -152,7 +152,7 @@
[ 'v8_use_arm_eabi_hardfloat=="true"', {
'defines': [
'USE_EABI_HARDFLOAT=1',
'CAN_USE_VFP_INSTRUCTIONS',
'CAN_USE_VFP3_INSTRUCTIONS',
],
'target_conditions': [
['_toolset=="target"', {
@@ -259,6 +259,7 @@
'WIN32',
],
'msvs_configuration_attributes': {
'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)',
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
'CharacterSet': '1',
},
@@ -343,7 +344,7 @@
},
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
'cflags': [ '-Wno-unused-parameter',
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
'-Wnon-virtual-dtor', '-Woverloaded-virtual' ],
}],
['OS=="android"', {
@@ -366,11 +367,6 @@
'conditions': [
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \
or OS=="android"', {
'cflags': [
'-fdata-sections',
'-ffunction-sections',
'-O3',
],
'conditions': [
[ 'gcc_version==44 and clang==0', {
'cflags': [
@@ -3444,8 +3444,8 @@ void TranscendentalCacheStub::Generate(MacroAssembler* masm) {
ExternalReference(RuntimeFunction(), masm->isolate());
__ TailCallExternalReference(runtime_function, 1, 1);
} else {
ASSERT(CpuFeatures::IsSupported(VFP2));
CpuFeatures::Scope scope(VFP2);
ASSERT(CpuFeatures::IsSupported(VFP3));
CpuFeatures::Scope scope(VFP3);

Label no_update;
Label skip_cache;
@@ -746,8 +746,10 @@ static void InstallCodeCommon(CompilationInfo* info) {

static void InsertCodeIntoOptimizedCodeMap(CompilationInfo* info) {
Handle<Code> code = info->code();
Handle<JSFunction> function = info->closure();
if (FLAG_cache_optimized_code && code->kind() == Code::OPTIMIZED_FUNCTION) {
if (FLAG_cache_optimized_code &&
info->osr_ast_id().IsNone() &&
code->kind() == Code::OPTIMIZED_FUNCTION) {
Handle<JSFunction> function = info->closure();
Handle<SharedFunctionInfo> shared(function->shared());
Handle<FixedArray> literals(function->literals());
Handle<Context> native_context(function->context()->native_context());
@@ -758,7 +760,9 @@ static void InsertCodeIntoOptimizedCodeMap(CompilationInfo* info) {


static bool InstallCodeFromOptimizedCodeMap(CompilationInfo* info) {
if (FLAG_cache_optimized_code && info->IsOptimizing()) {
if (FLAG_cache_optimized_code &&
info->osr_ast_id().IsNone() &&
info->IsOptimizing()) {
Handle<SharedFunctionInfo> shared = info->shared_info();
Handle<JSFunction> function = info->closure();
ASSERT(!function.is_null());