Browse Source

deps: update libuv to 1.4.0

PR-URL: https://github.com/iojs/io.js/pull/773
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
v1.8.0-commit
Saúl Ibarra Corretgé 10 years ago
committed by Ben Noordhuis
parent
commit
9681fcacf0
  1. 12
      deps/uv/ChangeLog
  2. 1
      deps/uv/Makefile.am
  3. 2
      deps/uv/configure.ac
  4. 6
      deps/uv/docs/src/stream.rst
  5. 2
      deps/uv/include/uv-version.h
  6. 5
      deps/uv/src/unix/stream.c
  7. 4
      deps/uv/src/unix/thread.c
  8. 2
      deps/uv/test/test-list.h
  9. 99
      deps/uv/test/test-pipe-set-non-blocking.c
  10. 2
      deps/uv/test/test-spawn.c
  11. 1
      deps/uv/uv.gyp

12
deps/uv/ChangeLog

@ -1,3 +1,15 @@
2015.02.10, Version 1.4.0 (Stable), 19fb8a90648f3763240db004b77ab984264409be
Changes since version 1.3.0:
* unix: check Android support for pthread_cond_timedwait_monotonic_np (Leith
Bade)
* test: use modified path in test (cjihrig)
* unix: implement uv_stream_set_blocking() (Ben Noordhuis)
2015.01.29, Version 1.3.0 (Stable), 165685b2a9a42cf96501d79cd6d48a18aaa16e3b 2015.01.29, Version 1.3.0 (Stable), 165685b2a9a42cf96501d79cd6d48a18aaa16e3b
Changes since version 1.2.1: Changes since version 1.2.1:

1
deps/uv/Makefile.am

@ -189,6 +189,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-pipe-sendmsg.c \ test/test-pipe-sendmsg.c \
test/test-pipe-server-close.c \ test/test-pipe-server-close.c \
test/test-pipe-close-stdout-read-stdin.c \ test/test-pipe-close-stdout-read-stdin.c \
test/test-pipe-set-non-blocking.c \
test/test-platform-output.c \ test/test-platform-output.c \
test/test-poll-close.c \ test/test-poll-close.c \
test/test-poll-close-doesnt-corrupt-stack.c \ test/test-poll-close-doesnt-corrupt-stack.c \

2
deps/uv/configure.ac

@ -13,7 +13,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_PREREQ(2.57) AC_PREREQ(2.57)
AC_INIT([libuv], [1.3.0], [https://github.com/libuv/libuv/issues]) AC_INIT([libuv], [1.4.0], [https://github.com/libuv/libuv/issues])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
m4_include([m4/libuv-extra-automake-flags.m4]) m4_include([m4/libuv-extra-automake-flags.m4])
m4_include([m4/as_case.m4]) m4_include([m4/as_case.m4])

6
deps/uv/docs/src/stream.rst

@ -206,12 +206,14 @@ API
Relying too much on this API is not recommended. It is likely to change Relying too much on this API is not recommended. It is likely to change
significantly in the future. significantly in the future.
Currently this only works on Windows and only for Currently only works on Windows for :c:type:`uv_pipe_t` handles.
:c:type:`uv_pipe_t` handles. On UNIX platforms, all :c:type:`uv_stream_t` handles are supported.
Also libuv currently makes no ordering guarantee when the blocking mode Also libuv currently makes no ordering guarantee when the blocking mode
is changed after write requests have already been submitted. Therefore it is is changed after write requests have already been submitted. Therefore it is
recommended to set the blocking mode immediately after opening or creating recommended to set the blocking mode immediately after opening or creating
the stream. the stream.
.. versionchanged:: 1.4.0 UNIX implementation added.
.. seealso:: The :c:type:`uv_handle_t` API functions also apply. .. seealso:: The :c:type:`uv_handle_t` API functions also apply.

2
deps/uv/include/uv-version.h

@ -31,7 +31,7 @@
*/ */
#define UV_VERSION_MAJOR 1 #define UV_VERSION_MAJOR 1
#define UV_VERSION_MINOR 3 #define UV_VERSION_MINOR 4
#define UV_VERSION_PATCH 0 #define UV_VERSION_PATCH 0
#define UV_VERSION_IS_RELEASE 1 #define UV_VERSION_IS_RELEASE 1
#define UV_VERSION_SUFFIX "" #define UV_VERSION_SUFFIX ""

5
deps/uv/src/unix/stream.c

@ -1573,5 +1573,8 @@ void uv__stream_close(uv_stream_t* handle) {
int uv_stream_set_blocking(uv_stream_t* handle, int blocking) { int uv_stream_set_blocking(uv_stream_t* handle, int blocking) {
return UV_ENOSYS; /* Don't need to check the file descriptor, uv__nonblock()
* will fail with EBADF if it's not valid.
*/
return uv__nonblock(uv__stream_fd(handle), !blocking);
} }

4
deps/uv/src/unix/thread.c

@ -330,7 +330,7 @@ int uv_cond_init(uv_cond_t* cond) {
if (err) if (err)
return -err; return -err;
#if !defined(__ANDROID__) #if !(defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC))
err = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); err = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
if (err) if (err)
goto error2; goto error2;
@ -388,7 +388,7 @@ int uv_cond_timedwait(uv_cond_t* cond, uv_mutex_t* mutex, uint64_t timeout) {
timeout += uv__hrtime(UV_CLOCK_PRECISE); timeout += uv__hrtime(UV_CLOCK_PRECISE);
ts.tv_sec = timeout / NANOSEC; ts.tv_sec = timeout / NANOSEC;
ts.tv_nsec = timeout % NANOSEC; ts.tv_nsec = timeout % NANOSEC;
#if defined(__ANDROID__) #if defined(__ANDROID__) && defined(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC)
/* /*
* The bionic pthread implementation doesn't support CLOCK_MONOTONIC, * The bionic pthread implementation doesn't support CLOCK_MONOTONIC,
* but has this alternative function instead. * but has this alternative function instead.

2
deps/uv/test/test-list.h

@ -167,6 +167,7 @@ TEST_DECLARE (pipe_ref4)
#ifndef _WIN32 #ifndef _WIN32
TEST_DECLARE (pipe_close_stdout_read_stdin) TEST_DECLARE (pipe_close_stdout_read_stdin)
#endif #endif
TEST_DECLARE (pipe_set_non_blocking)
TEST_DECLARE (process_ref) TEST_DECLARE (process_ref)
TEST_DECLARE (has_ref) TEST_DECLARE (has_ref)
TEST_DECLARE (active) TEST_DECLARE (active)
@ -339,6 +340,7 @@ TASK_LIST_START
#ifndef _WIN32 #ifndef _WIN32
TEST_ENTRY (pipe_close_stdout_read_stdin) TEST_ENTRY (pipe_close_stdout_read_stdin)
#endif #endif
TEST_ENTRY (pipe_set_non_blocking)
TEST_ENTRY (tty) TEST_ENTRY (tty)
TEST_ENTRY (stdio_over_pipes) TEST_ENTRY (stdio_over_pipes)
TEST_ENTRY (ip6_pton) TEST_ENTRY (ip6_pton)

99
deps/uv/test/test-pipe-set-non-blocking.c

@ -0,0 +1,99 @@
/* Copyright (c) 2015, Ben Noordhuis <info@bnoordhuis.nl>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "uv.h"
#include "task.h"
#ifdef _WIN32
TEST_IMPL(pipe_set_non_blocking) {
RETURN_SKIP("Test not implemented on Windows.");
}
#else /* !_WIN32 */
#include <errno.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <sys/un.h>
#include <unistd.h>
struct thread_ctx {
uv_barrier_t barrier;
int fd;
};
static void thread_main(void* arg) {
struct thread_ctx* ctx;
char buf[4096];
ssize_t n;
ctx = arg;
uv_barrier_wait(&ctx->barrier);
do
n = read(ctx->fd, buf, sizeof(buf));
while (n > 0 || (n == -1 && errno == EINTR));
ASSERT(n == 0);
}
TEST_IMPL(pipe_set_non_blocking) {
struct thread_ctx ctx;
uv_pipe_t pipe_handle;
uv_thread_t thread;
size_t nwritten;
char data[4096];
uv_buf_t buf;
int fd[2];
int n;
ASSERT(0 == uv_pipe_init(uv_default_loop(), &pipe_handle, 0));
ASSERT(0 == socketpair(AF_UNIX, SOCK_STREAM, 0, fd));
ASSERT(0 == uv_pipe_open(&pipe_handle, fd[0]));
ASSERT(0 == uv_stream_set_blocking((uv_stream_t*) &pipe_handle, 1));
ctx.fd = fd[1];
ASSERT(0 == uv_barrier_init(&ctx.barrier, 2));
ASSERT(0 == uv_thread_create(&thread, thread_main, &ctx));
uv_barrier_wait(&ctx.barrier);
buf.len = sizeof(data);
buf.base = data;
memset(data, '.', sizeof(data));
nwritten = 0;
while (nwritten < 10 << 20) {
/* The stream is in blocking mode so uv_try_write() should always succeed
* with the exact number of bytes that we wanted written.
*/
n = uv_try_write((uv_stream_t*) &pipe_handle, &buf, 1);
ASSERT(n == sizeof(data));
nwritten += n;
}
uv_close((uv_handle_t*) &pipe_handle, NULL);
ASSERT(0 == uv_run(uv_default_loop(), UV_RUN_DEFAULT));
ASSERT(0 == close(fd[1])); /* fd[0] is closed by uv_close(). */
ASSERT(0 == uv_thread_join(&thread));
uv_barrier_destroy(&ctx.barrier);
MAKE_VALGRIND_HAPPY();
return 0;
}
#endif /* !_WIN32 */

2
deps/uv/test/test-spawn.c

@ -1015,7 +1015,7 @@ TEST_IMPL(spawn_with_an_odd_path) {
char *path = getenv("PATH"); char *path = getenv("PATH");
ASSERT(path != NULL); ASSERT(path != NULL);
snprintf(newpath, 2048, ";.;%s", path); snprintf(newpath, 2048, ";.;%s", path);
SetEnvironmentVariable("PATH", path); SetEnvironmentVariable("PATH", newpath);
init_process_options("", exit_cb); init_process_options("", exit_cb);
options.file = options.args[0] = "program-that-had-better-not-exist"; options.file = options.args[0] = "program-that-had-better-not-exist";

1
deps/uv/uv.gyp

@ -329,6 +329,7 @@
'test/test-pipe-sendmsg.c', 'test/test-pipe-sendmsg.c',
'test/test-pipe-server-close.c', 'test/test-pipe-server-close.c',
'test/test-pipe-close-stdout-read-stdin.c', 'test/test-pipe-close-stdout-read-stdin.c',
'test/test-pipe-set-non-blocking.c',
'test/test-platform-output.c', 'test/test-platform-output.c',
'test/test-poll.c', 'test/test-poll.c',
'test/test-poll-close.c', 'test/test-poll-close.c',

Loading…
Cancel
Save