From 44314ccf48332c91db57a53d5fc0e3de48642681 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Wed, 16 Nov 2011 13:05:35 -0800 Subject: [PATCH] Upgrade libuv to 2007eb8 --- deps/uv/.mailmap | 1 + deps/uv/AUTHORS | 4 +++- deps/uv/config-unix.mk | 9 +++++++++ deps/uv/include/uv.h | 4 ++-- deps/uv/src/unix/eio/eio.c | 2 +- deps/uv/src/unix/freebsd.c | 8 +++++++- deps/uv/src/unix/netbsd.c | 2 +- deps/uv/src/unix/stream.c | 4 ++-- deps/uv/test/benchmark-pound.c | 2 +- deps/uv/test/runner-unix.c | 22 ---------------------- 10 files changed, 27 insertions(+), 31 deletions(-) diff --git a/deps/uv/.mailmap b/deps/uv/.mailmap index 2d608f95f4f..accc9621abf 100644 --- a/deps/uv/.mailmap +++ b/deps/uv/.mailmap @@ -8,3 +8,4 @@ San-Tai Hsu Isaac Z. Schlueter Saúl Ibarra Corretgé Yuki OKUMURA +Frank Denis diff --git a/deps/uv/AUTHORS b/deps/uv/AUTHORS index 2d43c366141..16f88934fc6 100644 --- a/deps/uv/AUTHORS +++ b/deps/uv/AUTHORS @@ -30,4 +30,6 @@ Saúl Ibarra Corretgé Felix Geisendörfer Yuki OKUMURA Roman Shtylman -Frank DENIS +Frank Denis +Carter Allen +Tj Holowaychuk diff --git a/deps/uv/config-unix.mk b/deps/uv/config-unix.mk index 9524061b1c5..8fe7254cfdd 100644 --- a/deps/uv/config-unix.mk +++ b/deps/uv/config-unix.mk @@ -74,6 +74,15 @@ OBJS += src/unix/freebsd.o OBJS += src/unix/kqueue.o endif +ifeq (DragonFly,$(uname_S)) +EV_CONFIG=config_freebsd.h +EIO_CONFIG=config_freebsd.h +CPPFLAGS += -Isrc/ares/config_freebsd +LINKFLAGS+= +OBJS += src/unix/freebsd.o +OBJS += src/unix/kqueue.o +endif + ifeq (NetBSD,$(uname_S)) EV_CONFIG=config_netbsd.h EIO_CONFIG=config_netbsd.h diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index 28ef8ee3439..a2c4f2aa7a5 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -48,7 +48,7 @@ extern "C" { #define UV_VERSION_MAJOR 0 -#define UV_VERSION_MINOR 1 +#define UV_VERSION_MINOR 6 #include /* int64_t */ @@ -730,7 +730,7 @@ UV_EXTERN int uv_tty_set_mode(uv_tty_t*, int mode); * To be called when the program exits. Resets TTY settings to default * values for the next process to take over. */ -UV_EXTERN void uv_tty_reset_mode(); +UV_EXTERN void uv_tty_reset_mode(void); /* * Gets the current Window size. On success zero is returned. diff --git a/deps/uv/src/unix/eio/eio.c b/deps/uv/src/unix/eio/eio.c index 2374006110d..75abd9bb69b 100644 --- a/deps/uv/src/unix/eio/eio.c +++ b/deps/uv/src/unix/eio/eio.c @@ -316,7 +316,7 @@ static int gettimeofday(struct timeval *tv, struct timezone *tz) #if HAVE_SENDFILE # if __linux # include -# elif __FreeBSD__ || defined __APPLE__ +# elif __FreeBSD__ || __DragonFly__ || defined __APPLE__ # include # include # elif __hpux diff --git a/deps/uv/src/unix/freebsd.c b/deps/uv/src/unix/freebsd.c index 7c5deabb844..a519f86d49d 100644 --- a/deps/uv/src/unix/freebsd.c +++ b/deps/uv/src/unix/freebsd.c @@ -50,11 +50,17 @@ int uv_exepath(char* buffer, size_t* size) { return -1; } - +#ifdef __DragonFly__ + mib[0] = CTL_KERN; + mib[1] = KERN_PROC; + mib[2] = KERN_PROC_ARGS; + mib[3] = getpid(); +#else mib[0] = CTL_KERN; mib[1] = KERN_PROC; mib[2] = KERN_PROC_PATHNAME; mib[3] = -1; +#endif cb = *size; if (sysctl(mib, 4, buffer, &cb, NULL, 0) < 0) { diff --git a/deps/uv/src/unix/netbsd.c b/deps/uv/src/unix/netbsd.c index 8b91f65c74a..cf83c344825 100644 --- a/deps/uv/src/unix/netbsd.c +++ b/deps/uv/src/unix/netbsd.c @@ -91,7 +91,7 @@ uint64_t uv_get_free_memory(void) { return -1; } - return (uint64_t) info.free * psysconf(_SC_PAGESIZE); + return (uint64_t) info.free * sysconf(_SC_PAGESIZE); } uint64_t uv_get_total_memory(void) { diff --git a/deps/uv/src/unix/stream.c b/deps/uv/src/unix/stream.c index 3cdeaa8cf7b..25737814e58 100644 --- a/deps/uv/src/unix/stream.c +++ b/deps/uv/src/unix/stream.c @@ -145,7 +145,7 @@ void uv__stream_destroy(uv_stream_t* stream) { req = ngx_queue_data(q, uv_write_t, queue); if (req->cb) { - uv__set_artificial_error(stream->loop, req->error); + uv__set_sys_error(stream->loop, req->error); req->cb(req, req->error ? -1 : 0); } } @@ -490,7 +490,7 @@ static void uv__write_callbacks(uv_stream_t* stream) { /* NOTE: call callback AFTER freeing the request data. */ if (req->cb) { - uv__set_artificial_error(stream->loop, req->error); + uv__set_sys_error(stream->loop, req->error); req->cb(req, req->error ? -1 : 0); } diff --git a/deps/uv/test/benchmark-pound.c b/deps/uv/test/benchmark-pound.c index 92a536db77f..64f404ca947 100644 --- a/deps/uv/test/benchmark-pound.c +++ b/deps/uv/test/benchmark-pound.c @@ -28,6 +28,7 @@ #undef NANOSEC #define NANOSEC ((uint64_t)10e8) +#undef DEBUG #define DEBUG 0 struct conn_rec_s; @@ -135,7 +136,6 @@ static void connect_cb(uv_connect_t* req, int status) { static void read_cb(uv_stream_t* stream, ssize_t nread, uv_buf_t buf) { - conn_rec* p = (conn_rec*)stream->data; uv_err_t err = uv_last_error(loop); ASSERT(stream != NULL); diff --git a/deps/uv/test/runner-unix.c b/deps/uv/test/runner-unix.c index 6033d64294d..3c78bb50a95 100644 --- a/deps/uv/test/runner-unix.c +++ b/deps/uv/test/runner-unix.c @@ -37,35 +37,13 @@ #include #include -#ifdef __APPLE__ -#include /* _NSGetExecutablePath */ - -static void get_executable_path() { - uint32_t bufsize = sizeof(executable_path); - _NSGetExecutablePath(executable_path, &bufsize); -} -#endif - -#ifdef __linux__ -static void get_executable_path() { - if (!executable_path[0]) { - readlink("/proc/self/exe", executable_path, PATHMAX - 1); - } -} -#endif - /* Do platform-specific initialization. */ void platform_init(int argc, char **argv) { /* Disable stdio output buffering. */ setvbuf(stdout, NULL, _IONBF, 0); setvbuf(stderr, NULL, _IONBF, 0); -#ifdef get_executable_path - get_executable_path(); -#else strcpy(executable_path, argv[0]); -#endif - signal(SIGPIPE, SIG_IGN); }