Skip to content

Commit 94eb980

Browse files
saghulMyles Borins
authored and
Myles Borins
committed
deps: upgrade libuv to 1.9.0
Fixes: #5737 Fixes: #4643 Fixes: #4291 Fixes: nodejs/node-v0.x-archive#8960 Refs: #3594 PR-URL: #5994 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Johan Bergström <[email protected]>
1 parent 06327e5 commit 94eb980

Some content is hidden

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

69 files changed

+1746
-395
lines changed

deps/uv/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ ipch
6565
# sphinx generated files
6666
/docs/build/
6767

68+
# Clion / IntelliJ project files
69+
/.idea/
70+
6871
*.xcodeproj
6972
*.xcworkspace
7073

deps/uv/.mailmap

+6
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,29 @@ Brian White <[email protected]>
88
99
Caleb James DeLisle <[email protected]> <[email protected]>
1010
Christoph Iserlohn <[email protected]>
11+
Devchandra Meetei Leishangthem <[email protected]>
1112
1213
Frank Denis <[email protected]>
1314
Isaac Z. Schlueter <[email protected]>
15+
Jason Williams <[email protected]>
1416
1517
1618
1719
1820
1921
2022
23+
24+
25+
Nicholas Vavilov <[email protected]>
2126
Rasmus Christian Pedersen <[email protected]>
2227
Rasmus Christian Pedersen <[email protected]> <[email protected]>
2328
2429
2530
Ryan Emery <[email protected]>
2631
2732
San-Tai Hsu <[email protected]>
33+
2834
Saúl Ibarra Corretgé <[email protected]>
2935
3036
Timothy J. Fontaine <[email protected]>

deps/uv/AUTHORS

+13
Original file line numberDiff line numberDiff line change
@@ -240,3 +240,16 @@ Yuval Brik <[email protected]>
240240
Joran Dirk Greef <[email protected]>
241241
Andrey Mazo <[email protected]>
242242
243+
Martin Bark <[email protected]>
244+
245+
Alexis Murzeau <[email protected]>
246+
247+
Nan Xiang <[email protected]>
248+
Samuel Lorétan <[email protected]>
249+
Nándor István Krácser <[email protected]>
250+
Katsutoshi Horie <[email protected]>
251+
Lukasz Jagiello <[email protected]>
252+
Robert Chiras <[email protected]>
253+
Kári Tristan Helgason <[email protected]>
254+
Krishnaraj Bhat <[email protected]>
255+
Enno Boland <[email protected]>

deps/uv/CONTRIBUTING.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ The stable branch is effectively frozen; patches that change the libuv
2323
API/ABI or affect the run-time behavior of applications get rejected.
2424

2525
In case of doubt, open an issue in the [issue tracker][], post your question
26-
to the [libuv mailing list], or contact one of project maintainers
27-
(@bnoordhuis, @piscisaureus, @indutny or @saghul) on [IRC][].
26+
to the [libuv mailing list], or contact one of [project maintainers][] on [IRC][].
2827

2928
Especially do so if you plan to work on something big. Nothing is more
3029
frustrating than seeing your hard work go to waste because your vision
@@ -138,7 +137,10 @@ $ git rebase upstream/v1.x # or upstream/master
138137
### TEST
139138

140139
Bug fixes and features should come with tests. Add your tests in the
141-
`test/` directory. Tests also need to be registered in `test/test-list.h`.
140+
`test/` directory. Each new test needs to be registered in `test/test-list.h`. If you add a new test file, it needs to be registered in two places:
141+
- `Makefile.am`: add the file's name to the `test_run_tests_SOURCES` list.
142+
- `uv.gyp`: add the file's name to the `sources` list in the `run-tests` target.
143+
142144
Look at other tests to see how they should be structured (license boilerplate,
143145
the way entry points are declared, etc.).
144146

@@ -164,3 +166,4 @@ not send out notifications when you add commits.
164166
[libuv mailing list]: http://groups.google.com/group/libuv
165167
[IRC]: http://webchat.freelibuv.net/?channels=libuv
166168
[Google C/C++ style guide]: http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml
169+
[project maintainers]: https://github.com/libuv/libuv/blob/master/MAINTAINERS.md

deps/uv/ChangeLog

+139
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,142 @@
1+
2016.04.08, Version 1.9.0 (Stable), 229b3a4cc150aebd6561e6bd43076eafa7a03756
2+
3+
Changes since version 1.8.0:
4+
5+
* win: wait for full timeout duration (João Reis)
6+
7+
* unix: fix support for uClibc-ng (Martin Bark)
8+
9+
* doc: indicate where new test files need to be added (Dave)
10+
11+
* test,unix: fix logic error in test runner (Ben Noordhuis)
12+
13+
* fs: don't nullify req->bufs on EINTR (Dave)
14+
15+
* osx: set the default thread stack size to RLIMIT_STACK (Saúl Ibarra Corretgé)
16+
17+
* build: invoke libtoolize with --copy (Ben Noordhuis)
18+
19+
* test: fixup eintr_handling (Saúl Ibarra Corretgé)
20+
21+
* osx: avoid compilation warning with Clang (Saúl Ibarra Corretgé)
22+
23+
* test,win: fix compilation with shared lib (Alexis Murzeau)
24+
25+
* test: fix race condition in pipe-close-stdout (Imran Iqbal)
26+
27+
* unix,win: add uv_os_tmpdir() (cjihrig)
28+
29+
* ios: fix undefined PTHREAD_STACK_MIN (Didiet)
30+
31+
* test: fix threadpool_multiple_event_loops for AIX (Imran Iqbal)
32+
33+
* unix: report errors for unpollable fds (Ben Noordhuis)
34+
35+
* win: fix watching root files (Nicholas Vavilov)
36+
37+
* build,win: print the Visual Studio version in use (Saúl Ibarra Corretgé)
38+
39+
* build,win: remove unneeded condition from GYP file (Saúl Ibarra Corretgé)
40+
41+
* test,win: fix compilation warning (Saúl Ibarra Corretgé)
42+
43+
* test: use uv_loop_close and assert its result (Nan Xiang)
44+
45+
* build: map 'AMD64' host arch to 'x64' (Ben Noordhuis)
46+
47+
* osx: protected use of potentially undefined macro (Samuel Lorétan)
48+
49+
* linux: fix compilation with musl (Saúl Ibarra Corretgé)
50+
51+
* doc: describe how to make release builds on Unix (Saúl Ibarra Corretgé)
52+
53+
* doc: add missing link in README (Saúl Ibarra Corretgé)
54+
55+
* build: python 2.x/3.x consistent print usage (Rasmus Christian Pedersen)
56+
57+
* test: assume no IPv6 if interfaces cannot be listed (Nan Xiang)
58+
59+
* darwin: replace F_FULLFSYNC with fdatasync syscall (Saúl Ibarra Corretgé)
60+
61+
* doc: add missing write callback to example (Nándor István Krácser)
62+
63+
* build: compile with -D_THREAD_SAFE on AIX (Imran Iqbal)
64+
65+
* test: fix threadpool_multiple_event_loops on PPC (Imran Iqbal)
66+
67+
* test: reduce timeout in tcp_close_while_connecting (Imran Iqbal)
68+
69+
* unix, win: consistently null-terminate buffers (Saúl Ibarra Corretgé)
70+
71+
* unix, win: count null byte on UV_ENOBUFS (Saúl Ibarra Corretgé)
72+
73+
* test: fix deadlocks in uv_cond_wait (Katsutoshi Horie)
74+
75+
* linux: fix cpu count (Lukasz Jagiello)
76+
77+
* unix: fix uv__handle_type for AIX (Imran Iqbal)
78+
79+
* linux: call fclose(), fix fdopen() memory leak (Ben Noordhuis)
80+
81+
* win: remove unneeded condition (Saúl Ibarra Corretgé)
82+
83+
* unix: fix compile error in Android using bionic (Robert Chiras)
84+
85+
* linux: add braces to multi-statement if (Kári Tristan Helgason)
86+
87+
* doc: add @cjihrig as a maintainer (Saúl Ibarra Corretgé)
88+
89+
* unix: add fork-safe open file function (Kári Tristan Helgason)
90+
91+
* linux: replace calls to fopen with uv__open_file (Kári Tristan Helgason)
92+
93+
* linux: remove redundant call to rewind() (Krishnaraj Bhat)
94+
95+
* win: remove duplicated code when processing fsevents (Saúl Ibarra Corretgé)
96+
97+
* test: fix poll_bad_fdtype for AIX (Imran Iqbal)
98+
99+
* linux: fix error checking in uv__open_file (Saúl Ibarra Corretgé)
100+
101+
* poll: add UV_DISCONNECT event (Santiago Gimeno)
102+
103+
* fs: realpath: fix string size before converting (Yuval Brik)
104+
105+
* win: use native APIs for UTF conversions (cjihrig)
106+
107+
* doc: clarify uv_loop_close() (Ben Noordhuis)
108+
109+
* unix: retry ioctl(TIOCGWINSZ) on EINTR (Ben Noordhuis)
110+
111+
* win,build: remove unused build defines (Saúl Ibarra Corretgé)
112+
113+
* win: fix buffer overflow in fs events (Joran Dirk Greef)
114+
115+
* win: fix uv_relative_path and remove dead branch (Joran Dirk Greef)
116+
117+
* unix: use open(2) with O_CLOEXEC on OS X (Kári Tristan Helgason)
118+
119+
* test: add missing copyright header (cjihrig)
120+
121+
* aix: fix 'POLLRDHUP undeclared' build error (Ben Noordhuis)
122+
123+
* unix,win: add uv_get_passwd() (cjihrig)
124+
125+
* process: fix uv_spawn edge-case (Santiago Gimeno)
126+
127+
* test: use %ld for printing uid/gid (Ben Noordhuis)
128+
129+
* aix: fix ahafs implementation (Imran Iqbal)
130+
131+
* aix: do not store absolute path to ahafs (Imran Iqbal)
132+
133+
* process: close process pipes safely (Santiago Gimeno)
134+
135+
* unix: open ttyname instead of /dev/tty (Enno Boland)
136+
137+
* unix: remove outdated comment (Kári Tristan Helgason)
138+
139+
1140
2015.12.15, Version 1.8.0 (Stable), 5467299450ecf61635657557b6e01aaaf6c3fdf4
2141

3142
Changes since version 1.7.5:

deps/uv/MAINTAINERS.md

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ libuv is currently managed by the following individuals:
66
* **Ben Noordhuis** ([@bnoordhuis](https://github.com/bnoordhuis))
77
- GPG key: D77B 1E34 243F BAF0 5F8E 9CC3 4F55 C8C8 46AB 89B9 (pubkey-bnoordhuis)
88
* **Bert Belder** ([@piscisaureus](https://github.com/piscisaureus))
9+
* **Colin Ihrig** ([@cjihrig](https://github.com/cjihrig))
910
* **Fedor Indutny** ([@indutny](https://github.com/indutny))
1011
- GPG key: AF2E EA41 EC34 47BF DD86 FED9 D706 3CCE 19B7 E890 (pubkey-indutny)
1112
* **Saúl Ibarra Corretgé** ([@saghul](https://github.com/saghul))

deps/uv/Makefile.am

+11-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ if WINNT
4343

4444
include_HEADERS += include/uv-win.h include/tree.h
4545
AM_CPPFLAGS += -I$(top_srcdir)/src/win \
46-
-DWIN32_LEAN_AND_MEAN \
4746
-D_WIN32_WINNT=0x0600
4847
LIBS += -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv
4948
libuv_la_SOURCES += src/win/async.c \
@@ -130,6 +129,7 @@ EXTRA_DIST = test/fixtures/empty_file \
130129
TESTS = test/run-tests
131130
check_PROGRAMS = test/run-tests
132131
test_run_tests_CFLAGS =
132+
test_run_tests_LDFLAGS =
133133
test_run_tests_SOURCES = test/blackhole-server.c \
134134
test/dns-server.c \
135135
test/echo-server.c \
@@ -151,6 +151,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
151151
test/test-default-loop-close.c \
152152
test/test-delayed-accept.c \
153153
test/test-dlerror.c \
154+
test/test-eintr-handling.c \
154155
test/test-embed.c \
155156
test/test-emfile.c \
156157
test/test-error.c \
@@ -161,6 +162,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
161162
test/test-get-currentexe.c \
162163
test/test-get-loadavg.c \
163164
test/test-get-memory.c \
165+
test/test-get-passwd.c \
164166
test/test-getaddrinfo.c \
165167
test/test-getnameinfo.c \
166168
test/test-getsockname.c \
@@ -242,6 +244,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
242244
test/test-timer-again.c \
243245
test/test-timer-from-check.c \
244246
test/test-timer.c \
247+
test/test-tmpdir.c \
245248
test/test-tty.c \
246249
test/test-udp-bind.c \
247250
test/test-udp-create-socket-early.c \
@@ -280,7 +283,7 @@ endif
280283

281284

282285
if AIX
283-
libuv_la_CFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500 -D_LINUX_SOURCE_COMPAT
286+
libuv_la_CFLAGS += -D_ALL_SOURCE -D_XOPEN_SOURCE=500 -D_LINUX_SOURCE_COMPAT -D_THREAD_SAFE
284287
include_HEADERS += include/uv-aix.h
285288
libuv_la_SOURCES += src/unix/aix.c
286289
endif
@@ -301,15 +304,18 @@ libuv_la_SOURCES += src/unix/darwin.c \
301304
src/unix/fsevents.c \
302305
src/unix/kqueue.c \
303306
src/unix/proctitle.c
307+
test_run_tests_LDFLAGS += -lutil
304308
endif
305309

306310
if DRAGONFLY
307311
include_HEADERS += include/uv-bsd.h
312+
test_run_tests_LDFLAGS += -lutil
308313
endif
309314

310315
if FREEBSD
311316
include_HEADERS += include/uv-bsd.h
312317
libuv_la_SOURCES += src/unix/freebsd.c src/unix/kqueue.c
318+
test_run_tests_LDFLAGS += -lutil
313319
endif
314320

315321
if LINUX
@@ -320,16 +326,19 @@ libuv_la_SOURCES += src/unix/linux-core.c \
320326
src/unix/linux-syscalls.c \
321327
src/unix/linux-syscalls.h \
322328
src/unix/proctitle.c
329+
test_run_tests_LDFLAGS += -lutil
323330
endif
324331

325332
if NETBSD
326333
include_HEADERS += include/uv-bsd.h
327334
libuv_la_SOURCES += src/unix/kqueue.c src/unix/netbsd.c
335+
test_run_tests_LDFLAGS += -lutil
328336
endif
329337

330338
if OPENBSD
331339
include_HEADERS += include/uv-bsd.h
332340
libuv_la_SOURCES += src/unix/kqueue.c src/unix/openbsd.c
341+
test_run_tests_LDFLAGS += -lutil
333342
endif
334343

335344
if SUNOS

deps/uv/Makefile.mingw

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ CFLAGS += -Wall \
2020
-Iinclude \
2121
-Isrc \
2222
-Isrc/win \
23-
-DWIN32_LEAN_AND_MEAN \
2423
-D_WIN32_WINNT=0x0600
2524

2625
INCLUDES = include/stdint-msvc2008.h \

deps/uv/README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,16 @@ project tree manually:
156156

157157
### Unix
158158

159-
Run:
159+
For Debug builds (recommended) run:
160160

161161
$ ./gyp_uv.py -f make
162162
$ make -C out
163163

164+
For Release builds run:
165+
166+
$ ./gyp_uv.py -f make
167+
$ BUILDTYPE=Release make -C out
168+
164169
Run `./gyp_uv.py -f make -Dtarget_arch=x32` to build [x32][] binaries.
165170

166171
### OS X
@@ -243,3 +248,4 @@ See the [guidelines for contributing][].
243248
[Visual Studio Express 2010]: http://www.microsoft.com/visualstudio/eng/products/visual-studio-2010-express
244249
[guidelines for contributing]: https://github.com/libuv/libuv/blob/master/CONTRIBUTING.md
245250
[libuv_banner]: https://raw.githubusercontent.com/libuv/libuv/master/img/banner.png
251+
[x32]: https://en.wikipedia.org/wiki/X32_ABI

deps/uv/appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: v1.8.0.build{build}
1+
version: v1.9.0.build{build}
22

33
install:
44
- cinst -y nsis

deps/uv/autogen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [$UV_EXTRA_AUTOMAKE_FLAGS])" \
4040
> m4/libuv-extra-automake-flags.m4
4141

4242
set -ex
43-
"$LIBTOOLIZE"
43+
"$LIBTOOLIZE" --copy
4444
"$ACLOCAL" -I m4
4545
"$AUTOCONF"
4646
"$AUTOMAKE" --add-missing --copy

deps/uv/checksparse.sh

+2
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ test/test-fs.c
101101
test/test-get-currentexe.c
102102
test/test-get-loadavg.c
103103
test/test-get-memory.c
104+
test/test-get-passwd.c
104105
test/test-getaddrinfo.c
105106
test/test-getsockname.c
106107
test/test-homedir.c
@@ -155,6 +156,7 @@ test/test-threadpool-cancel.c
155156
test/test-threadpool.c
156157
test/test-timer-again.c
157158
test/test-timer.c
159+
test/test-tmpdir.c
158160
test/test-tty.c
159161
test/test-udp-dgram-too-big.c
160162
test/test-udp-ipv6.c

deps/uv/configure.ac

+1-1
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], [1.8.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.9.0], [https://github.com/libuv/libuv/issues])
1717
AC_CONFIG_MACRO_DIR([m4])
1818
m4_include([m4/libuv-extra-automake-flags.m4])
1919
m4_include([m4/as_case.m4])

0 commit comments

Comments
 (0)