Permalink
Browse files

uv: Upgrade to v0.11.21

  • Loading branch information...
1 parent f3189ac commit cd08c8a0e5e99ed4933b87fc5e188afcd4299f73 @tjfontaine tjfontaine committed Feb 27, 2014
Showing with 2,267 additions and 388 deletions.
  1. +7 −6 deps/uv/.gitignore
  2. +2 −0 deps/uv/.mailmap
  3. +12 −0 deps/uv/AUTHORS
  4. +103 −2 deps/uv/ChangeLog
  5. +6 −1 deps/uv/Makefile.am
  6. +2 −0 deps/uv/Makefile.mingw
  7. +1 −1 deps/uv/README.md
  8. +1 −1 deps/uv/android-configure
  9. +3 −3 deps/uv/common.gypi
  10. +1 −1 deps/uv/configure.ac
  11. +2 −2 deps/uv/gyp_uv.py
  12. +24 −0 deps/uv/include/uv-errno.h
  13. +10 −14 deps/uv/include/uv-unix.h
  14. +38 −0 deps/uv/include/uv-version.h
  15. +3 −2 deps/uv/include/uv-win.h
  16. +182 −51 deps/uv/include/uv.h
  17. +25 −0 deps/uv/src/fs-poll.c
  18. +238 −0 deps/uv/src/heap-inl.h
  19. +32 −0 deps/uv/src/unix/core.c
  20. +189 −20 deps/uv/src/unix/fs.c
  21. +1 −1 deps/uv/src/unix/fsevents.c
  22. +9 −0 deps/uv/src/unix/internal.h
  23. +5 −5 deps/uv/src/unix/kqueue.c
  24. +16 −8 deps/uv/src/unix/linux-core.c
  25. +3 −3 deps/uv/src/unix/linux-inotify.c
  26. +36 −0 deps/uv/src/unix/linux-syscalls.c
  27. +2 −0 deps/uv/src/unix/linux-syscalls.h
  28. +43 −11 deps/uv/src/unix/loop.c
  29. +32 −0 deps/uv/src/unix/pipe.c
  30. +20 −0 deps/uv/src/unix/process.c
  31. +10 −6 deps/uv/src/unix/stream.c
  32. +15 −9 deps/uv/src/unix/sunos.c
  33. +3 −1 deps/uv/src/unix/tcp.c
  34. +35 −19 deps/uv/src/unix/timer.c
  35. +25 −0 deps/uv/src/unix/udp.c
  36. +20 −0 deps/uv/src/uv-common.c
  37. +0 −14 deps/uv/src/version.c
  38. +43 −22 deps/uv/src/win/core.c
  39. +25 −25 deps/uv/src/win/fs-event.c
  40. +85 −39 deps/uv/src/win/fs.c
  41. +116 −2 deps/uv/src/win/pipe.c
  42. +3 −3 deps/uv/src/win/process.c
  43. +3 −0 deps/uv/src/win/stream.c
  44. +8 −1 deps/uv/src/win/tcp.c
  45. +40 −0 deps/uv/src/win/udp.c
  46. +37 −0 deps/uv/src/win/util.c
  47. +5 −5 deps/uv/test/benchmark-async.c
  48. +6 −7 deps/uv/test/benchmark-multi-accept.c
  49. +2 −5 deps/uv/test/run-benchmarks.c
  50. +13 −5 deps/uv/test/run-tests.c
  51. +3 −4 deps/uv/test/runner.c
  52. +12 −8 deps/uv/test/runner.h
  53. +2 −2 deps/uv/test/task.h
  54. +5 −6 deps/uv/test/test-embed.c
  55. +40 −9 deps/uv/test/test-fs-event.c
  56. +39 −0 deps/uv/test/test-fs-poll.c
  57. +76 −31 deps/uv/test/test-fs.c
  58. +24 −2 deps/uv/test/test-list.h
  59. +54 −0 deps/uv/test/test-loop-close.c
  60. +122 −0 deps/uv/test/test-pipe-getsockname.c
  61. +15 −0 deps/uv/test/test-platform-output.c
  62. +84 −0 deps/uv/test/test-shutdown-twice.c
  63. +13 −13 deps/uv/test/test-signal-multiple-loops.c
  64. +118 −5 deps/uv/test/test-spawn.c
  65. +4 −2 deps/uv/test/test-thread.c
  66. +1 −1 deps/uv/test/test-threadpool-cancel.c
  67. +96 −0 deps/uv/test/test-udp-multicast-interface.c
  68. +10 −4 deps/uv/uv.gyp
  69. +7 −6 deps/uv/vcbuild.bat
View
@@ -43,12 +43,13 @@ Makefile.in
/out/
/build/gyp
-/run-tests
-/run-tests.exe
-/run-tests.dSYM
-/run-benchmarks
-/run-benchmarks.exe
-/run-benchmarks.dSYM
+/test/.libs/
+/test/run-tests
+/test/run-tests.exe
+/test/run-tests.dSYM
+/test/run-benchmarks
+/test/run-benchmarks.exe
+/test/run-benchmarks.dSYM
*.sln
*.vcproj
View
@@ -12,9 +12,11 @@ Keno Fischer <kenof@stanford.edu> <kfischer+github@college.harvard.edu>
Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
Maciej Małecki <maciej.malecki@notimplemented.org> <me@mmalecki.com>
Marc Schlaich <marc.schlaich@googlemail.com> <marc.schlaich@gmail.com>
+Rasmus Pedersen <ruysch@outlook.com> <zerhacken@yahoo.com>
Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
Ryan Emery <seebees@gmail.com>
+Sam Roberts <vieuxtech@gmail.com> <sam@strongloop.com>
San-Tai Hsu <vanilla@fatpipi.com>
Saúl Ibarra Corretgé <saghul@gmail.com>
Shigeki Ohtsu <ohtsu@iij.ad.jp> <ohtsu@ohtsu.org>
View
@@ -111,4 +111,16 @@ Yazhong Liu <yorkiefixer@gmail.com>
Sam Roberts <vieuxtech@gmail.com>
River Tarnell <river@loreley.flyingparchment.org.uk>
Nathan Sweet <nathanjsweet@gmail.com>
+Alex Crichton <alex@alexcrichton.com>
+Luca Bruno <lucab@debian.org>
Trevor Norris <trev.norris@gmail.com>
+Oguz Bastemur <obastemur@gmail.com>
+Dylan Cali <calid1984@gmail.com>
+Austin Foxley <austinf@cetoncorp.com>
+Benjamin Saunders <ben.e.saunders@gmail.com>
+Geoffry Song <goffrie@gmail.com>
+Rasmus Pedersen <ruysch@outlook.com>
+William Light <wrl@illest.net>
+Oleg Efimov <o.efimov@corp.badoo.com>
+Lars Gierth <larsg@systemli.org>
+rcp <zerhacken@yahoo.com>
View
@@ -1,4 +1,105 @@
-2014.01.23, Version 0.11.18 (Unstable)
+2014.02.28, Version 0.11.21 (Unstable)
+
+Changes since version 0.11.20:
+
+* unix: fix uv_fs_write when using an empty buffer (Saúl Ibarra Corretgé)
+
+* unix, windows: add assertion in uv_loop_delete (Saúl Ibarra Corretgé)
+
+
+2014.02.27, Version 0.11.20 (Unstable), 88355e081b51c69ee1e2b6b0015a4e3d38bd0579
+
+Changes since version 0.11.19:
+
+* stream: start thread after assignments (Oguz Bastemur)
+
+* fs: `uv__cloexec()` opened fd (Fedor Indutny)
+
+* gyp: qualify `library` variable (Fedor Indutny)
+
+* unix, win: add uv_udp_set_multicast_interface() (Austin Foxley)
+
+* unix: fix uv_tcp_nodelay return value in case of error (Saúl Ibarra Corretgé)
+
+* unix: call setgoups before calling setuid/setgid (Saúl Ibarra Corretgé)
+
+* include: mark close_cb field as private (Saúl Ibarra Corretgé)
+
+* unix, windows: map EFBIG errno (Saúl Ibarra Corretgé)
+
+* unix: correct error when calling uv_shutdown twice (Keno Fischer)
+
+* windows: fix building on MinGW (Alex Crichton)
+
+* windows: always initialize uv_process_t (Alex Crichton)
+
+* include: expose libuv version in header files (Saúl Ibarra Corretgé)
+
+* fs: vectored IO API for filesystem read/write (Benjamin Saunders)
+
+* windows: freeze in uv_tcp_endgame (Alexis Campailla)
+
+* sunos: handle rearm errors (Fedor Indutny)
+
+* unix: use a heap for timers (Ben Noordhuis)
+
+* linux: always deregister closing fds from epoll (Geoffry Song)
+
+* linux: include grp.h for setgroups() (William Light)
+
+* unix, windows: add uv_loop_init and uv_loop_close (Saúl Ibarra Corretgé)
+
+* unix, windows: add uv_getrusage() function (Oleg Efimov)
+
+* win: minor error handle fix to uv_pipe_write_impl (Rasmus Pedersen)
+
+* heap: fix node removal (Keno Fischer)
+
+* win: fix C99/C++ comment (Rasmus Pedersen)
+
+* fs: vectored IO API for filesystem read/write (Benjamin Saunders)
+
+* unix, windows: add uv_pipe_getsockname (Saúl Ibarra Corretgé)
+
+* unix, windows: map ENOPROTOOPT errno (Saúl Ibarra Corretgé)
+
+* errno: add ETXTBSY (Fedor Indutny)
+
+* fsevent: rename filename field to path (Saúl Ibarra Corretgé)
+
+* unix, windows: add uv_fs_event_getpath (Saúl Ibarra Corretgé)
+
+* unix, windows: add uv_fs_poll_getpath (Saúl Ibarra Corretgé)
+
+* unix, windows: map ERANGE errno (Saúl Ibarra Corretgé)
+
+* unix, windows: set required size on UV_ENOBUFS (Saúl Ibarra Corretgé)
+
+* unix, windows: clarify what uv_stream_set_blocking does (Saúl Ibarra
+ Corretgé)
+
+* fs: use preadv on Linux if available (Brian White)
+
+
+2014.01.30, Version 0.11.19 (Unstable), 336a1825309744f920230ec3e427e78571772347
+
+Changes since version 0.11.18:
+
+* linux: move sscanf() out of the assert() (Trevor Norris)
+
+* linux: fix C99/C++ comment (Fedor Indutny)
+
+
+2014.01.30, Version 0.10.24 (Stable), aecd296b6bce9b40f06a61c5c94e43d45ac7308a
+
+Changes since version 0.10.23:
+
+* linux: move sscanf() out of the assert() (Trevor Norris)
+
+* linux: fix C99/C++ comment (Fedor Indutny)
+
+
+2014.01.23, Version 0.11.18 (Unstable), d47962e9d93d4a55a9984623feaf546406c9cdbb
Changes since version 0.11.17:
@@ -21,7 +122,7 @@ Changes since version 0.11.17:
* linux: move sscanf() out of the assert() (Trevor Norris)
-2014.01.23, Version 0.10.23 (Stable)
+2014.01.23, Version 0.10.23 (Stable), dbd218e699fec8be311d85e4788be9e28ae884f8
Changes since version 0.10.22:
View
@@ -17,14 +17,15 @@ ACLOCAL_AMFLAGS = -I m4
AM_CPPFLAGS = -I$(top_srcdir)/include \
-I$(top_srcdir)/src
-include_HEADERS=include/uv.h include/uv-errno.h
+include_HEADERS=include/uv.h include/uv-errno.h include/uv-version.h
CLEANFILES =
lib_LTLIBRARIES = libuv.la
libuv_la_CFLAGS = @CFLAGS@
libuv_la_LDFLAGS = -no-undefined -version-info 11:0:0
libuv_la_SOURCES = src/fs-poll.c \
+ src/heap-inl.h \
src/inet.c \
src/queue.h \
src/uv-common.c \
@@ -146,6 +147,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-list.h \
test/test-loop-handles.c \
test/test-loop-alive.c \
+ test/test-loop-close.c \
test/test-loop-stop.c \
test/test-loop-time.c \
test/test-multiple-listen.c \
@@ -155,6 +157,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-ping-pong.c \
test/test-pipe-bind-error.c \
test/test-pipe-connect-error.c \
+ test/test-pipe-getsockname.c \
test/test-pipe-server-close.c \
test/test-platform-output.c \
test/test-poll-close.c \
@@ -166,6 +169,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-semaphore.c \
test/test-shutdown-close.c \
test/test-shutdown-eof.c \
+ test/test-shutdown-twice.c \
test/test-signal-multiple-loops.c \
test/test-signal.c \
test/test-spawn.c \
@@ -196,6 +200,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
test/test-tty.c \
test/test-udp-dgram-too-big.c \
test/test-udp-ipv6.c \
+ test/test-udp-multicast-interface.c \
test/test-udp-multicast-join.c \
test/test-udp-multicast-ttl.c \
test/test-udp-open.c \
View
@@ -26,8 +26,10 @@ CFLAGS += -Wall \
INCLUDES = include/stdint-msvc2008.h \
include/tree.h \
include/uv-errno.h \
+ include/uv-version.h \
include/uv-win.h \
include/uv.h \
+ src/heap-inl.h \
src/queue.h \
src/uv-common.h \
src/win/atomicops-inl.h \
View
@@ -133,7 +133,7 @@ OS X using the GCC or XCode toolchain.
Solaris 121 and later using GCC toolchain.
-## patches
+## Patches
See the [guidelines for contributing][].
@@ -3,7 +3,7 @@
export TOOLCHAIN=$PWD/android-toolchain
mkdir -p $TOOLCHAIN
$1/build/tools/make-standalone-toolchain.sh \
- --toolchain=arm-linux-androideabi-4.7 \
+ --toolchain=arm-linux-androideabi-4.8 \
--arch=arm \
--install-dir=$TOOLCHAIN \
--platform=android-9
View
@@ -3,7 +3,7 @@
'visibility%': 'hidden', # V8's visibility setting
'target_arch%': 'ia32', # set v8's target architecture
'host_arch%': 'ia32', # set v8's host architecture
- 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds
+ 'uv_library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds
'component%': 'static_library', # NB. these names match with what V8 expects
'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way
'gcc_version%': 'unknown',
@@ -19,7 +19,7 @@
'msvs_settings': {
'VCCLCompilerTool': {
'target_conditions': [
- ['library=="static_library"', {
+ ['uv_library=="static_library"', {
'RuntimeLibrary': 1, # static debug
}, {
'RuntimeLibrary': 3, # DLL debug
@@ -56,7 +56,7 @@
'msvs_settings': {
'VCCLCompilerTool': {
'target_conditions': [
- ['library=="static_library"', {
+ ['uv_library=="static_library"', {
'RuntimeLibrary': 0, # static release
}, {
'RuntimeLibrary': 2, # debug release
View
@@ -13,7 +13,7 @@
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
AC_PREREQ(2.57)
-AC_INIT([libuv], [0.11.18], [https://github.com/joyent/libuv/issues])
+AC_INIT([libuv], [0.11.21], [https://github.com/joyent/libuv/issues])
AC_CONFIG_MACRO_DIR([m4])
m4_include([m4/libuv-extra-automake-flags.m4])
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects] UV_EXTRA_AUTOMAKE_FLAGS)
View
@@ -88,8 +88,8 @@ def run_gyp(args):
if not any(a.startswith('-Dtarget_arch=') for a in args):
args.append('-Dtarget_arch=%s' % host_arch())
- if not any(a.startswith('-Dlibrary=') for a in args):
- args.append('-Dlibrary=static_library')
+ if not any(a.startswith('-Duv_library=') for a in args):
+ args.append('-Duv_library=static_library')
if not any(a.startswith('-Dcomponent=') for a in args):
args.append('-Dcomponent=static_library')
View
@@ -364,10 +364,34 @@
# define UV__ETIMEDOUT (-4039)
#endif
+#if defined(ETXTBSY) && !defined(_WIN32)
+# define UV__ETXTBSY (-ETXTBSY)
+#else
+# define UV__ETXTBSY (-4038)
+#endif
+
#if defined(EXDEV) && !defined(_WIN32)
# define UV__EXDEV (-EXDEV)
#else
# define UV__EXDEV (-4037)
#endif
+#if defined(EFBIG) && !defined(_WIN32)
+# define UV__EFBIG (-EFBIG)
+#else
+# define UV__EFBIG (-4036)
+#endif
+
+#if defined(ENOPROTOOPT) && !defined(_WIN32)
+# define UV__ENOPROTOOPT (-ENOPROTOOPT)
+#else
+# define UV__ENOPROTOOPT (-4035)
+#endif
+
+#if defined(ERANGE) && !defined(_WIN32)
+# define UV__ERANGE (-ERANGE)
+#else
+# define UV__ERANGE (-4034)
+#endif
+
#endif /* UV_ERRNO_H_ */
View
@@ -169,23 +169,24 @@ typedef struct {
void* wq[2]; \
uv_mutex_t wq_mutex; \
uv_async_t wq_async; \
+ uv_rwlock_t cloexec_lock; \
uv_handle_t* closing_handles; \
void* process_handles[1][2]; \
void* prepare_handles[2]; \
void* check_handles[2]; \
void* idle_handles[2]; \
void* async_handles[2]; \
struct uv__async async_watcher; \
- /* RB_HEAD(uv__timers, uv_timer_s) */ \
- struct uv__timers { \
- struct uv_timer_s* rbh_root; \
- } timer_handles; \
+ struct { \
+ void* min; \
+ unsigned int nelts; \
+ } timer_heap; \
+ uint64_t timer_counter; \
uint64_t time; \
int signal_pipefd[2]; \
uv__io_t signal_io_watcher; \
uv_signal_t child_watcher; \
int emfile_fd; \
- uint64_t timer_counter; \
UV_PLATFORM_LOOP_FIELDS \
#define UV_REQ_TYPE_PRIVATE /* empty */
@@ -264,14 +265,8 @@ typedef struct {
int pending; \
#define UV_TIMER_PRIVATE_FIELDS \
- /* RB_ENTRY(uv_timer_s) tree_entry; */ \
- struct { \
- struct uv_timer_s* rbe_left; \
- struct uv_timer_s* rbe_right; \
- struct uv_timer_s* rbe_parent; \
- int rbe_color; \
- } tree_entry; \
uv_timer_cb timer_cb; \
+ void* heap_node[3]; \
uint64_t timeout; \
uint64_t repeat; \
uint64_t start_id;
@@ -294,14 +289,15 @@ typedef struct {
uv_file file; \
int flags; \
mode_t mode; \
- void* buf; \
- size_t len; \
+ unsigned int nbufs; \
+ uv_buf_t* bufs; \
off_t off; \
uv_uid_t uid; \
uv_gid_t gid; \
double atime; \
double mtime; \
struct uv__work work_req; \
+ uv_buf_t bufsml[4]; \
#define UV_WORK_PRIVATE_FIELDS \
struct uv__work work_req;
Oops, something went wrong.

0 comments on commit cd08c8a

Please sign in to comment.