Skip to content

Commit e49429e

Browse files
committed
deps: update libuv to v0.11.28
1 parent aa3b4b4 commit e49429e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3243
-928
lines changed

deps/uv/.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1+
12
23
34
45
Bert Belder <[email protected]> <user@ChrUbuntu.(none)>
56
67
Brian White <[email protected]>
78
9+
Caleb James DeLisle <[email protected]> <[email protected]>
810
Christoph Iserlohn <[email protected]>
911
1012
Frank Denis <[email protected]>
@@ -15,6 +17,8 @@ Keno Fischer <[email protected]> <[email protected]>
1517
1618
1719
Rasmus Christian Pedersen <[email protected]>
20+
Rasmus Christian Pedersen <[email protected]>
21+
Rasmus Christian Pedersen <[email protected]>
1822
Rasmus Christian Pedersen <[email protected]> <[email protected]>
1923
2024

deps/uv/AUTHORS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,12 @@ HungMingWu <[email protected]>
146146
Jay Satiro <[email protected]>
147147
Leith Bade <[email protected]>
148148
Peter Atashian <[email protected]>
149+
Tim Cooper <[email protected]>
150+
Caleb James DeLisle <[email protected]>
151+
Jameson Nash <[email protected]>
152+
Graham Lee <[email protected]>
153+
Andrew Low <[email protected]>
154+
Pavel Platto <[email protected]>
155+
Tony Kelman <[email protected]>
156+
John Firebaugh <[email protected]>
157+
lilohuang <[email protected]>

deps/uv/ChangeLog

Lines changed: 90 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,93 @@
1-
2014.06.28, Version 0.11.26 (Unstable)
1+
2014.08.08, Version 0.11.28 (Unstable)
2+
3+
Changes since version 0.11.27:
4+
5+
* unix, windows: const-ify handle in uv_udp_getsockname (Rasmus Pedersen)
6+
7+
* windows: use UV_ECANCELED for aborted TCP writes (Saúl Ibarra Corretgé)
8+
9+
* windows: add more required environment variables (Jameson Nash)
10+
11+
* windows: sort environment variables before calling CreateProcess (Jameson
12+
Nash)
13+
14+
* unix, windows: move uv_loop_close out of assert (John Firebaugh)
15+
16+
* windows: fix buffer overflow on uv__getnameinfo_work() (lilohuang)
17+
18+
* windows: add uv_backend_timeout (Jameson Nash)
19+
20+
* test: disable tcp_close_accept on Windows (Saúl Ibarra Corretgé)
21+
22+
* windows: read the PATH env var of the child (Alex Crichton)
23+
24+
* include: avoid using C++ 'template' reserved word (Iñaki Baz Castillo)
25+
26+
* include: fix version number (Saúl Ibarra Corretgé)
27+
28+
29+
2014.07.32, Version 0.11.27 (Unstable), ffe24f955032d060968ea0289af365006afed55e
30+
31+
Changes since version 0.11.26:
32+
33+
* unix, windows: use the same threadpool implementation (Saúl Ibarra Corretgé)
34+
35+
* unix: use struct sockaddr_storage for target UDP addr (Saúl Ibarra Corretgé)
36+
37+
* doc: add documentation to uv_udp_start_recv (Andrius Bentkus)
38+
39+
* common: use common uv__count_bufs code (Andrius Bentkus)
40+
41+
* unix, win: add send_queue_size and send_queue_count to uv_udp_t (Andrius
42+
Bentkus)
43+
44+
* unix, win: add uv_udp_try_send (Andrius Bentkus)
45+
46+
* unix: return UV_EAGAIN if uv_try_write cannot write any data (Saúl Ibarra
47+
Corretgé)
48+
49+
* windows: fix compatibility with cygwin pipes (Jameson Nash)
50+
51+
* windows: count queued bytes even if request completed immediately (Saúl
52+
Ibarra Corretgé)
53+
54+
* windows: disable CRT debug handler on MinGW32 (Saúl Ibarra Corretgé)
55+
56+
* windows: map ERROR_INVALID_DRIVE to UV_ENOENT (Saúl Ibarra Corretgé)
57+
58+
* unix: try to write immediately in uv_udp_send (Saúl Ibarra Corretgé)
59+
60+
* unix: remove incorrect assert (Saúl Ibarra Corretgé)
61+
62+
* openbsd: avoid requiring privileges for uv_resident_set_memory (Aaron Bieber)
63+
64+
* unix: guarantee write queue cb execution order in streams (Andrius Bentkus)
65+
66+
* img: add logo files (Saúl Ibarra Corretgé)
67+
68+
* aix: improve AIX compatibility (Andrew Low)
69+
70+
* windows: return bind error immediately when implicitly binding (Saúl Ibarra
71+
Corretgé)
72+
73+
* windows: don't use atexit for cleaning up the threadpool (Saúl Ibarra
74+
Corretgé)
75+
76+
* windows: destroy work queue elements when colsing a loop (Saúl Ibarra
77+
Corretgé)
78+
79+
* unix, windows: add uv_fs_mkdtemp (Pavel Platto)
80+
81+
* build: handle platforms without multiprocessing.synchronize (Saúl Ibarra
82+
Corretgé)
83+
84+
* windows: change GENERIC_ALL to GENERIC_WRITE in fs__create_junction (Tony
85+
Kelman)
86+
87+
* windows: relay TCP bind errors via ipc (Alexis Campailla)
88+
89+
90+
2014.06.28, Version 0.11.26 (Unstable), 115281a1058c4034d5c5ccedacb667fe3f6327ea
291

392
Changes since version 0.11.25:
493

deps/uv/Makefile.am

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4
1717
AM_CPPFLAGS = -I$(top_srcdir)/include \
1818
-I$(top_srcdir)/src
1919

20-
include_HEADERS=include/uv.h include/uv-errno.h include/uv-version.h
20+
include_HEADERS=include/uv.h include/uv-errno.h include/uv-threadpool.h include/uv-version.h
2121

2222
CLEANFILES =
2323

@@ -28,6 +28,7 @@ libuv_la_SOURCES = src/fs-poll.c \
2828
src/heap-inl.h \
2929
src/inet.c \
3030
src/queue.h \
31+
src/threadpool.c \
3132
src/uv-common.c \
3233
src/uv-common.h \
3334
src/version.c
@@ -67,7 +68,6 @@ libuv_la_SOURCES += src/win/async.c \
6768
src/win/stream-inl.h \
6869
src/win/tcp.c \
6970
src/win/thread.c \
70-
src/win/threadpool.c \
7171
src/win/timer.c \
7272
src/win/tty.c \
7373
src/win/udp.c \
@@ -99,7 +99,6 @@ libuv_la_SOURCES += src/unix/async.c \
9999
src/unix/stream.c \
100100
src/unix/tcp.c \
101101
src/unix/thread.c \
102-
src/unix/threadpool.c \
103102
src/unix/timer.c \
104103
src/unix/tty.c \
105104
src/unix/udp.c
@@ -197,6 +196,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
197196
test/test-tcp-write-to-half-open-connection.c \
198197
test/test-tcp-writealot.c \
199198
test/test-tcp-try-write.c \
199+
test/test-tcp-write-queue-order.c \
200200
test/test-thread.c \
201201
test/test-threadpool-cancel.c \
202202
test/test-threadpool.c \
@@ -215,6 +215,8 @@ test_run_tests_SOURCES = test/blackhole-server.c \
215215
test/test-udp-open.c \
216216
test/test-udp-options.c \
217217
test/test-udp-send-and-recv.c \
218+
test/test-udp-send-immediate.c \
219+
test/test-udp-try-send.c \
218220
test/test-walk-handles.c \
219221
test/test-watcher-cross-stop.c
220222
test_run_tests_LDADD = libuv.la
@@ -228,7 +230,7 @@ test_run_tests_SOURCES += test/runner-unix.c \
228230
endif
229231

230232
if AIX
231-
test_run_tests_CFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500
233+
test_run_tests_CFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500 -D_LINUX_SOURCE_COMPAT
232234
endif
233235

234236
if SUNOS
@@ -237,7 +239,7 @@ endif
237239

238240

239241
if AIX
240-
libuv_la_CFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500
242+
libuv_la_CFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500 -D_LINUX_SOURCE_COMPAT
241243
libuv_la_SOURCES += src/unix/aix.c
242244
endif
243245

deps/uv/Makefile.mingw

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ CFLAGS += -Wall \
2626
INCLUDES = include/stdint-msvc2008.h \
2727
include/tree.h \
2828
include/uv-errno.h \
29+
include/uv-threadpool.h \
2930
include/uv-version.h \
3031
include/uv-win.h \
3132
include/uv.h \
@@ -42,6 +43,7 @@ INCLUDES = include/stdint-msvc2008.h \
4243

4344
OBJS = src/fs-poll.o \
4445
src/inet.o \
46+
src/threadpool.o \
4547
src/uv-common.o \
4648
src/version.o \
4749
src/win/async.o \
@@ -63,7 +65,6 @@ OBJS = src/fs-poll.o \
6365
src/win/stream.o \
6466
src/win/tcp.o \
6567
src/win/thread.o \
66-
src/win/threadpool.o \
6768
src/win/timer.o \
6869
src/win/tty.o \
6970
src/win/udp.o \

deps/uv/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
# libuv
1+
![libuv][libuv_banner]
2+
3+
## Overview
24

35
libuv is a multi-platform support library with a focus on asynchronous I/O. It
46
was primarily developed for use by [Node.js](http://nodejs.org), but it's also
57
used by Mozilla's [Rust language](http://www.rust-lang.org/),
68
[Luvit](http://luvit.io/), [Julia](http://julialang.org/),
7-
[pyuv](https://crate.io/packages/pyuv/), and [others](https://github.com/joyent/libuv/wiki/Projects-that-use-libuv).
9+
[pyuv](https://github.com/saghul/pyuv), and [others](https://github.com/joyent/libuv/wiki/Projects-that-use-libuv).
810

911
## Feature highlights
1012

@@ -141,3 +143,4 @@ See the [guidelines for contributing][].
141143
[Python]: https://www.python.org/downloads/
142144
[Visual Studio Express 2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
143145
[guidelines for contributing]: https://github.com/joyent/libuv/blob/master/CONTRIBUTING.md
146+
[libuv_banner]: https://github.com/raw/joyent/libuv/master/img/banner.png

deps/uv/configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [0.11.26], [https://github.com/joyent/libuv/issues])
16+
AC_INIT([libuv], [0.11.28], [https://github.com/joyent/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

deps/uv/gyp_uv.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
import subprocess
77
import sys
88

9+
try:
10+
import multiprocessing.synchronize
11+
gyp_parallel_support = True
12+
except ImportError:
13+
gyp_parallel_support = False
14+
15+
916
CC = os.environ.get('CC', 'cc')
1017
script_dir = os.path.dirname(__file__)
1118
uv_root = os.path.normpath(script_dir)
@@ -94,6 +101,11 @@ def run_gyp(args):
94101
if not any(a.startswith('-Dcomponent=') for a in args):
95102
args.append('-Dcomponent=static_library')
96103

104+
# Some platforms (OpenBSD for example) don't have multiprocessing.synchronize
105+
# so gyp must be run with --no-parallel
106+
if not gyp_parallel_support:
107+
args.append('--no-parallel')
108+
97109
gyp_args = list(args)
98110
print gyp_args
99111
run_gyp(gyp_args)

deps/uv/img/banner.png

43.1 KB
Loading

deps/uv/img/logos.svg

Lines changed: 152 additions & 0 deletions
Loading

deps/uv/include/uv-aix.h

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy
4+
* of this software and associated documentation files (the "Software"), to
5+
* deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
* sell copies of the Software, and to permit persons to whom the Software is
8+
* furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in
11+
* all copies or substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
* IN THE SOFTWARE.
20+
*/
21+
22+
#ifndef UV_AIX_H
23+
#define UV_AIX_H
24+
25+
#define UV_PLATFORM_LOOP_FIELDS \
26+
int fs_fd; \
27+
28+
#define UV_PLATFORM_FS_EVENT_FIELDS \
29+
uv__io_t event_watcher; \
30+
char *dir_filename; \
31+
32+
#endif /* UV_AIX_H */

deps/uv/include/uv-threadpool.h

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
2+
*
3+
* Permission is hereby granted, free of charge, to any person obtaining a copy
4+
* of this software and associated documentation files (the "Software"), to
5+
* deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
7+
* sell copies of the Software, and to permit persons to whom the Software is
8+
* furnished to do so, subject to the following conditions:
9+
*
10+
* The above copyright notice and this permission notice shall be included in
11+
* all copies or substantial portions of the Software.
12+
*
13+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
18+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
19+
* IN THE SOFTWARE.
20+
*/
21+
22+
/*
23+
* This file is private to libuv. It provides common functionality to both
24+
* Windows and Unix backends.
25+
*/
26+
27+
#ifndef UV_THREADPOOL_H_
28+
#define UV_THREADPOOL_H_
29+
30+
struct uv__work {
31+
void (*work)(struct uv__work *w);
32+
void (*done)(struct uv__work *w, int status);
33+
struct uv_loop_s* loop;
34+
void* wq[2];
35+
};
36+
37+
#endif /* UV_THREADPOOL_H_ */

deps/uv/include/uv-unix.h

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,12 @@
4242
#endif
4343
#include <signal.h>
4444

45+
#include "uv-threadpool.h"
46+
4547
#if defined(__linux__)
4648
# include "uv-linux.h"
49+
#elif defined(_AIX)
50+
# include "uv-aix.h"
4751
#elif defined(__sun)
4852
# include "uv-sunos.h"
4953
#elif defined(__APPLE__)
@@ -96,13 +100,6 @@ struct uv__async {
96100
int wfd;
97101
};
98102

99-
struct uv__work {
100-
void (*work)(struct uv__work *w);
101-
void (*done)(struct uv__work *w, int status);
102-
struct uv_loop_s* loop;
103-
void* wq[2];
104-
};
105-
106103
#ifndef UV_PLATFORM_SEM_T
107104
# define UV_PLATFORM_SEM_T sem_t
108105
#endif
@@ -218,7 +215,7 @@ typedef struct {
218215

219216
#define UV_UDP_SEND_PRIVATE_FIELDS \
220217
void* queue[2]; \
221-
struct sockaddr_in6 addr; \
218+
struct sockaddr_storage addr; \
222219
unsigned int nbufs; \
223220
uv_buf_t* bufs; \
224221
ssize_t status; \

deps/uv/include/uv-version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 0
3434
#define UV_VERSION_MINOR 11
35-
#define UV_VERSION_PATCH 26
35+
#define UV_VERSION_PATCH 28
3636
#define UV_VERSION_IS_RELEASE 1
3737

3838
#endif /* UV_VERSION_H */

0 commit comments

Comments
 (0)