Skip to content

Commit a9cfdea

Browse files
cjihrigMylesBorins
authored andcommitted
deps: upgrade libuv to 1.14.1
Fixes: #12737 Fixes: #13581 Fixes: #15117 PR-URL: #14866 Reviewed-By: Refael Ackermann <[email protected]> Reviewed-By: James M Snell <[email protected]>
1 parent 8cbec3b commit a9cfdea

Some content is hidden

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

54 files changed

+1486
-555
lines changed

deps/uv/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Makefile.in
3939

4040
# Generated by gyp for android
4141
*.target.mk
42+
/android-toolchain
4243

4344
/out/
4445
/build/gyp

deps/uv/AUTHORS

+9
Original file line numberDiff line numberDiff line change
@@ -299,3 +299,12 @@ Barnabas Gema <[email protected]>
299299
Romain Caire <[email protected]>
300300
Robert Ayrapetyan <[email protected]>
301301
Refael Ackermann <[email protected]>
302+
André Klitzing <[email protected]>
303+
Matthew Taylor <[email protected]>
304+
305+
306+
Anticrisis <[email protected]>
307+
Jacob Segal <[email protected]>
308+
Maciej Szeptuch (Neverous) <[email protected]>
309+
Joel Winarske <[email protected]>
310+
Gergely Nagy <[email protected]>

deps/uv/ChangeLog

+115
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,118 @@
1+
2017.09.07, Version 1.14.1 (Stable), b0f9fb2a07a5e638b1580fe9a42a356c3ab35f37
2+
3+
Changes since version 1.14.0:
4+
5+
* fs, win: add support for user symlinks (Bartosz Sosnowski)
6+
7+
* cygwin: include uv-posix.h header (Joel Winarske)
8+
9+
* zos: fix semaphore initialization (jBarz)
10+
11+
* zos: improve loop_count benchmark performance (jBarz)
12+
13+
* zos, test: flush out the oob data in callback (jBarz)
14+
15+
* unix,win: check for bad flags in uv_fs_copyfile() (cjihrig)
16+
17+
* unix: modify argv[0] when process title is set (Matthew Taylor)
18+
19+
* unix: don't use req->loop in uv__fs_copyfile() (cjihrig)
20+
21+
* doc: fix a trivial typo (Vladimír Čunát)
22+
23+
* android: fix uv_cond_timedwait on API level < 21 (Gergely Nagy)
24+
25+
* win: add uv__once_init() calls (Bartosz Sosnowski)
26+
27+
* unix,windows: init all requests in fs calls (cjihrig)
28+
29+
* unix,windows: return UV_EINVAL on NULL fs reqs (cjihrig)
30+
31+
* windows: add POST macro to fs functions (cjihrig)
32+
33+
* unix: handle partial sends in uv_fs_copyfile() (A. Hauptmann)
34+
35+
* Revert "win, test: fix double close in test runner" (Bartosz Sosnowski)
36+
37+
* win, test: remove surplus CloseHandle (Bartosz Sosnowski)
38+
39+
40+
2017.08.17, Version 1.14.0 (Stable), e0d31e9e21870f88277746b6d59cf07b977cdfea
41+
42+
Changes since version 1.13.1:
43+
44+
* unix: check for NULL in uv_os_unsetenv for parameter name (André Klitzing)
45+
46+
* doc: add thread safety warning for process title (Matthew Taylor)
47+
48+
* unix: always copy process title into local buffer (Matthew Taylor)
49+
50+
* poll: add support for OOB TCP and GPIO interrupts (CurlyMoo)
51+
52+
* win,build: fix appveyor properly (Refael Ackermann)
53+
54+
* win: include filename in dlopen error message (Ben Noordhuis)
55+
56+
* aix: add netmask, mac address into net interfaces (Gireesh Punathil)
57+
58+
* unix, windows: map EREMOTEIO errno (Ben Noordhuis)
59+
60+
* unix: fix wrong MAC of uv_interface_address (XadillaX)
61+
62+
* win,build: fix building from Windows SDK or VS console (Saúl Ibarra Corretgé)
63+
64+
* github: fix link to help repo in issue template (Ben Noordhuis)
65+
66+
* zos: remove nonexistent include from autotools build (Saúl Ibarra Corretgé)
67+
68+
* misc: remove reference to pthread-fixes.h from LICENSE (Saúl Ibarra Corretgé)
69+
70+
* docs: fix guide source code example paths (Anticrisis)
71+
72+
* android: fix compilation with new NDK versions (Saúl Ibarra Corretgé)
73+
74+
* misc: add android-toolchain to .gitignore (Saúl Ibarra Corretgé)
75+
76+
* win, fs: support unusual reparse points (Bartosz Sosnowski)
77+
78+
* android: fix detection of pthread_condattr_setclock (Saúl Ibarra Corretgé)
79+
80+
* android: remove no longer needed check (Saúl Ibarra Corretgé)
81+
82+
* doc: update instructions for building on Android (Saúl Ibarra Corretgé)
83+
84+
* win, process: support semicolons in PATH variable (Bartosz Sosnowski)
85+
86+
* doc: document uv_async_(init|send) return values (Ben Noordhuis)
87+
88+
* doc: add Android as a tier 3 supported platform (Saúl Ibarra Corretgé)
89+
90+
* unix: add missing semicolon (jBarz)
91+
92+
* win, test: fix double close in test runner (Bartosz Sosnowski)
93+
94+
* doc: update supported windows version baseline (Ben Noordhuis)
95+
96+
* test,zos: skip chown root test (jBarz)
97+
98+
* test,zos: use gid=-1 to test spawn_setgid_fails (jBarz)
99+
100+
* zos: fix hr timer resolution (jBarz)
101+
102+
* android: fix blocking recvmsg due to netlink bug (Jacob Segal)
103+
104+
* zos: read more accurate rss info from RSM (jBarz)
105+
106+
* win: allow bound/connected socket in uv_tcp_open() (Maciej Szeptuch
107+
(Neverous))
108+
109+
* doc: differentiate SmartOS and SunOS support (cjihrig)
110+
111+
* unix: make uv_poll_stop() remove fd from pollset (Ben Noordhuis)
112+
113+
* unix, windows: add basic uv_fs_copyfile() (cjihrig)
114+
115+
1116
2017.07.07, Version 1.13.1 (Stable), 2bb4b68758f07cd8617838e68c44c125bc567ba6
2117

3118
Changes since version 1.13.0:

deps/uv/LICENSE

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ The externally maintained libraries used by libuv are:
6262
- stdint-msvc2008.h (from msinttypes), copyright Alexander Chemeris. Three
6363
clause BSD license.
6464

65-
- pthread-fixes.h, pthread-fixes.c, copyright Google Inc. and Sony Mobile
66-
Communications AB. Three clause BSD license.
65+
- pthread-fixes.c, copyright Google Inc. and Sony Mobile Communications AB.
66+
Three clause BSD license.
6767

6868
- android-ifaddrs.h, android-ifaddrs.c, copyright Berkeley Software Design
6969
Inc, Kenneth MacKay and Emergya (Cloud4all, FP7/2007-2013, grant agreement

deps/uv/Makefile.am

+7-7
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
169169
test/test-env-vars.c \
170170
test/test-error.c \
171171
test/test-fail-always.c \
172+
test/test-fs-copyfile.c \
172173
test/test-fs-event.c \
173174
test/test-fs-poll.c \
174175
test/test-fs.c \
@@ -212,10 +213,11 @@ test_run_tests_SOURCES = test/blackhole-server.c \
212213
test/test-pipe-close-stdout-read-stdin.c \
213214
test/test-pipe-set-non-blocking.c \
214215
test/test-platform-output.c \
216+
test/test-poll.c \
215217
test/test-poll-close.c \
216218
test/test-poll-close-doesnt-corrupt-stack.c \
217219
test/test-poll-closesocket.c \
218-
test/test-poll.c \
220+
test/test-poll-oob.c \
219221
test/test-process-title.c \
220222
test/test-queue-foreach-delete.c \
221223
test/test-ref.c \
@@ -333,11 +335,11 @@ if ANDROID
333335
include_HEADERS += include/android-ifaddrs.h \
334336
include/pthread-barrier.h
335337
libuv_la_SOURCES += src/unix/android-ifaddrs.c \
336-
src/unix/pthread-fixes.c \
337-
src/unix/pthread-barrier.c
338+
src/unix/pthread-fixes.c
338339
endif
339340

340341
if CYGWIN
342+
include_HEADERS += include/uv-posix.h
341343
libuv_la_CFLAGS += -D_GNU_SOURCE
342344
libuv_la_SOURCES += src/unix/cygwin.c \
343345
src/unix/bsd-ifaddrs.c \
@@ -360,8 +362,7 @@ libuv_la_SOURCES += src/unix/bsd-ifaddrs.c \
360362
src/unix/darwin-proctitle.c \
361363
src/unix/fsevents.c \
362364
src/unix/kqueue.c \
363-
src/unix/proctitle.c \
364-
src/unix/pthread-barrier.c
365+
src/unix/proctitle.c
365366
test_run_tests_LDFLAGS += -lutil
366367
endif
367368

@@ -436,7 +437,7 @@ libuv_la_SOURCES += src/unix/no-proctitle.c \
436437
endif
437438

438439
if OS390
439-
include_HEADERS += include/pthread-fixes.h include/pthread-barrier.h
440+
include_HEADERS += include/pthread-barrier.h
440441
libuv_la_CFLAGS += -D_UNIX03_THREADS \
441442
-D_UNIX03_SOURCE \
442443
-D_OPEN_SYS_IF_EXT=1 \
@@ -453,7 +454,6 @@ libuv_la_CFLAGS += -D_UNIX03_THREADS \
453454
-qFLOAT=IEEE
454455
libuv_la_LDFLAGS += -qXPLINK
455456
libuv_la_SOURCES += src/unix/pthread-fixes.c \
456-
src/unix/pthread-barrier.c \
457457
src/unix/no-fsevents.c \
458458
src/unix/os390.c \
459459
src/unix/os390-syscalls.c \

deps/uv/README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,14 @@ Make sure that you specify the architecture you wish to build for in the
267267
Run:
268268

269269
```bash
270-
$ source ./android-configure NDK_PATH gyp
270+
$ source ./android-configure NDK_PATH gyp [API_LEVEL]
271+
$ make -C out
272+
```
273+
274+
The default API level is 24, but a different one can be selected as follows:
275+
276+
```bash
277+
$ source ./android-configure ~/android-ndk-r15b gyp 21
271278
$ make -C out
272279
```
273280

deps/uv/SUPPORTED_PLATFORMS.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
|---|---|---|---|
55
| GNU/Linux | Tier 1 | Linux >= 2.6.32 with glibc >= 2.12 | |
66
| macOS | Tier 1 | macOS >= 10.7 | |
7-
| Windows | Tier 1 | Windows >= XP SP1 | MSVC 2008 and later are supported |
7+
| Windows | Tier 1 | Windows >= 8.1 | MSVC 2008 and later are supported |
88
| FreeBSD | Tier 1 | >= 9 (see note) | |
99
| AIX | Tier 2 | >= 6 | Maintainers: @libuv/aix |
1010
| z/OS | Tier 2 | >= V2R2 | Maintainers: @libuv/zos |
1111
| Linux with musl | Tier 2 | musl >= 1.0 | |
12-
| SunOS | Tier 2 | Solaris 121 and later | Maintainers: @libuv/sunos |
12+
| SmartOS | Tier 2 | >= 14.4 | Maintainers: @libuv/smartos |
13+
| Android | Tier 3 | NDK >= r15b | |
1314
| MinGW | Tier 3 | MinGW32 and MinGW-w64 | |
15+
| SunOS | Tier 3 | Solaris 121 and later | |
1416
| Other | Tier 3 | N/A | |
1517

1618
#### Note on FreeBSD 9

deps/uv/android-configure

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,20 @@
22

33
export TOOLCHAIN=$PWD/android-toolchain
44
mkdir -p $TOOLCHAIN
5+
API=${3:-24}
56
$1/build/tools/make-standalone-toolchain.sh \
67
--toolchain=arm-linux-androideabi-4.9 \
78
--arch=arm \
89
--install-dir=$TOOLCHAIN \
9-
--platform=android-21
10+
--platform=android-$API \
11+
--force
1012
export PATH=$TOOLCHAIN/bin:$PATH
1113
export AR=arm-linux-androideabi-ar
1214
export CC=arm-linux-androideabi-gcc
1315
export CXX=arm-linux-androideabi-g++
1416
export LINK=arm-linux-androideabi-g++
1517
export PLATFORM=android
18+
export CFLAGS="-D__ANDROID_API__=$API"
1619

1720
if [[ $2 == 'gyp' ]]
1821
then

deps/uv/appveyor.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
version: v1.13.1.build{build}
1+
version: v1.14.1.build{build}
2+
3+
init:
4+
- git config --global core.autocrlf true
25

36
install:
47
- cinst -y nsis

deps/uv/checksparse.sh

+1
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ test/test-embed.c
9696
test/test-env-vars.c
9797
test/test-error.c
9898
test/test-fail-always.c
99+
test/test-fs-copyfile.c
99100
test/test-fs-event.c
100101
test/test-fs-poll.c
101102
test/test-fs.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.13.1], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.14.1], [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])

deps/uv/docs/src/async.rst

+5-1
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,16 @@ API
3535
3636
Initialize the handle. A NULL callback is allowed.
3737
38+
:returns: 0 on success, or an error code < 0 on failure.
39+
3840
.. note::
3941
Unlike other handle initialization functions, it immediately starts the handle.
4042
4143
.. c:function:: int uv_async_send(uv_async_t* async)
4244
43-
Wakeup the event loop and call the async handle's callback.
45+
Wake up the event loop and call the async handle's callback.
46+
47+
:returns: 0 on success, or an error code < 0 on failure.
4448
4549
.. note::
4650
It's safe to call this function from any thread. The callback will be called on the

deps/uv/docs/src/fs.rst

+18-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ Data types
9292
UV_FS_READLINK,
9393
UV_FS_CHOWN,
9494
UV_FS_FCHOWN,
95-
UV_FS_REALPATH
95+
UV_FS_REALPATH,
96+
UV_FS_COPYFILE
9697
} uv_fs_type;
9798

9899
.. c:type:: uv_dirent_t
@@ -241,6 +242,22 @@ API
241242
242243
Equivalent to :man:`ftruncate(2)`.
243244
245+
.. c:function:: int uv_fs_copyfile(uv_loop_t* loop, uv_fs_t* req, const char* path, const char* new_path, int flags, uv_fs_cb cb)
246+
247+
Copies a file from `path` to `new_path`. Supported `flags` are described below.
248+
249+
- `UV_FS_COPYFILE_EXCL`: If present, `uv_fs_copyfile()` will fail with
250+
`UV_EEXIST` if the destination path already exists. The default behavior
251+
is to overwrite the destination if it exists.
252+
253+
.. warning::
254+
If the destination path is created, but an error occurs while copying
255+
the data, then the destination path is removed. There is a brief window
256+
of time between closing and removing the file where another process
257+
could access the file.
258+
259+
.. versionadded:: 1.14.0
260+
244261
.. c:function:: int uv_fs_sendfile(uv_loop_t* loop, uv_fs_t* req, uv_file out_fd, uv_file in_fd, int64_t in_offset, size_t length, uv_fs_cb cb)
245262
246263
Limited equivalent to :man:`sendfile(2)`.

deps/uv/docs/src/misc.rst

+15-8
Original file line numberDiff line numberDiff line change
@@ -186,17 +186,24 @@ API
186186
187187
.. c:function:: int uv_get_process_title(char* buffer, size_t size)
188188
189-
Gets the title of the current process. If `buffer` is `NULL` or `size` is
190-
zero, `UV_EINVAL` is returned. If `size` cannot accommodate the process
191-
title and terminating `NULL` character, the function returns `UV_ENOBUFS`.
189+
Gets the title of the current process. You *must* call `uv_setup_args`
190+
before calling this function. If `buffer` is `NULL` or `size` is zero,
191+
`UV_EINVAL` is returned. If `size` cannot accommodate the process title and
192+
terminating `NULL` character, the function returns `UV_ENOBUFS`.
193+
194+
.. warning::
195+
`uv_get_process_title` is not thread safe on any platform except Windows.
192196
193197
.. c:function:: int uv_set_process_title(const char* title)
194198
195-
Sets the current process title. On platforms with a fixed size buffer for the
196-
process title the contents of `title` will be copied to the buffer and
197-
truncated if larger than the available space. Other platforms will return
198-
`UV_ENOMEM` if they cannot allocate enough space to duplicate the contents of
199-
`title`.
199+
Sets the current process title. You *must* call `uv_setup_args` before
200+
calling this function. On platforms with a fixed size buffer for the process
201+
title the contents of `title` will be copied to the buffer and truncated if
202+
larger than the available space. Other platforms will return `UV_ENOMEM` if
203+
they cannot allocate enough space to duplicate the contents of `title`.
204+
205+
.. warning::
206+
`uv_set_process_title` is not thread safe on any platform except Windows.
200207
201208
.. c:function:: int uv_resident_set_memory(size_t* rss)
202209

0 commit comments

Comments
 (0)