diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2013-03-14 16:40:27 +0400 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2013-03-14 18:55:26 +0400 |
commit | e99dff461772ea16586448667860edd13b4190e4 (patch) | |
tree | 728e0b8b3aa7e44df46cce42c0f6310e7ea426d1 /deps | |
parent | 028c630ecd920d59fc0e8ad295e0fe0eac8e1ef1 (diff) |
deps: upgrade libuv to 7b66ea1
Diffstat (limited to 'deps')
-rw-r--r-- | deps/uv/include/uv.h | 6 | ||||
-rw-r--r-- | deps/uv/src/unix/tcp.c | 8 | ||||
-rw-r--r-- | deps/uv/src/unix/tty.c | 43 | ||||
-rw-r--r-- | deps/uv/test/runner-win.c | 30 |
4 files changed, 70 insertions, 17 deletions
diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h index de375d4b0ee..ea11a13bfd7 100644 --- a/deps/uv/include/uv.h +++ b/deps/uv/include/uv.h @@ -47,7 +47,7 @@ extern "C" { #define UV_VERSION_MAJOR 0 -#define UV_VERSION_MINOR 9 +#define UV_VERSION_MINOR 10 #if defined(_MSC_VER) && _MSC_VER < 1600 @@ -660,12 +660,12 @@ UV_EXTERN int uv_tcp_keepalive(uv_tcp_t* handle, unsigned int delay); /* - * This setting applies to Windows only. * Enable/disable simultaneous asynchronous accept requests that are * queued by the operating system when listening for new tcp connections. * This setting is used to tune a tcp server for the desired performance. * Having simultaneous accepts can significantly improve the rate of - * accepting connections (which is why it is enabled by default). + * accepting connections (which is why it is enabled by default) but + * may lead to uneven load distribution in multi-process setups. */ UV_EXTERN int uv_tcp_simultaneous_accepts(uv_tcp_t* handle, int enable); diff --git a/deps/uv/src/unix/tcp.c b/deps/uv/src/unix/tcp.c index a51576ba1bb..26ab53dbb84 100644 --- a/deps/uv/src/unix/tcp.c +++ b/deps/uv/src/unix/tcp.c @@ -343,11 +343,11 @@ int uv_tcp_keepalive(uv_tcp_t* handle, int on, unsigned int delay) { } -int uv_tcp_simultaneous_accepts(uv_tcp_t* handle, int on) { - if (on) - handle->flags |= UV_TCP_SINGLE_ACCEPT; - else +int uv_tcp_simultaneous_accepts(uv_tcp_t* handle, int enable) { + if (enable) handle->flags &= ~UV_TCP_SINGLE_ACCEPT; + else + handle->flags |= UV_TCP_SINGLE_ACCEPT; return 0; } diff --git a/deps/uv/src/unix/tty.c b/deps/uv/src/unix/tty.c index 49efee7f53f..df32e67345d 100644 --- a/deps/uv/src/unix/tty.c +++ b/deps/uv/src/unix/tty.c @@ -118,25 +118,52 @@ int uv_tty_get_winsize(uv_tty_t* tty, int* width, int* height) { uv_handle_type uv_guess_handle(uv_file file) { + struct sockaddr sa; struct stat s; + socklen_t len; + int type; - if (file < 0) { + if (file < 0) return UV_UNKNOWN_HANDLE; - } - if (isatty(file)) { + if (isatty(file)) return UV_TTY; - } - if (fstat(file, &s)) { + if (fstat(file, &s)) return UV_UNKNOWN_HANDLE; - } - if (!S_ISSOCK(s.st_mode) && !S_ISFIFO(s.st_mode)) { + if (S_ISREG(s.st_mode)) return UV_FILE; + + if (S_ISCHR(s.st_mode)) + return UV_FILE; /* XXX UV_NAMED_PIPE? */ + + if (S_ISFIFO(s.st_mode)) + return UV_NAMED_PIPE; + + if (!S_ISSOCK(s.st_mode)) + return UV_UNKNOWN_HANDLE; + + len = sizeof(type); + if (getsockopt(file, SOL_SOCKET, SO_TYPE, &type, &len)) + return UV_UNKNOWN_HANDLE; + + len = sizeof(sa); + if (getsockname(file, &sa, &len)) + return UV_UNKNOWN_HANDLE; + + if (type == SOCK_DGRAM) + if (sa.sa_family == AF_INET || sa.sa_family == AF_INET6) + return UV_UDP; + + if (type == SOCK_STREAM) { + if (sa.sa_family == AF_INET || sa.sa_family == AF_INET6) + return UV_TCP; + if (sa.sa_family == AF_UNIX) + return UV_NAMED_PIPE; } - return UV_NAMED_PIPE; + return UV_UNKNOWN_HANDLE; } diff --git a/deps/uv/test/runner-win.c b/deps/uv/test/runner-win.c index 8f534bcdb7c..3aae1c3e9cb 100644 --- a/deps/uv/test/runner-win.c +++ b/deps/uv/test/runner-win.c @@ -44,6 +44,11 @@ /* Do platform-specific initialization. */ void platform_init(int argc, char **argv) { + const char* tap; + + tap = getenv("UV_TAP_OUTPUT"); + tap_output = (tap != NULL && atoi(tap) > 0); + /* Disable the "application crashed" popup. */ SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); @@ -207,13 +212,34 @@ long int process_output_size(process_info_t *p) { int process_copy_output(process_info_t *p, int fd) { DWORD read; char buf[1024]; + char *line, *start; if (SetFilePointer(p->stdio_out, 0, 0, FILE_BEGIN) == INVALID_SET_FILE_POINTER) return -1; + if (tap_output) + write(fd, "#", 1); + while (ReadFile(p->stdio_out, (void*)&buf, sizeof(buf), &read, NULL) && - read > 0) - write(fd, buf, read); + read > 0) { + if (tap_output) { + start = buf; + + while ((line = strchr(start, '\n')) != NULL) { + write(fd, start, line - start + 1); + write(fd, "#", 1); + start = line + 1; + } + + if (start < buf + read) + write(fd, start, buf + read - start); + } else { + write(fd, buf, read); + } + } + + if (tap_output) + write(fd, "\n", 1); if (GetLastError() != ERROR_HANDLE_EOF) return -1; |