Skip to content

Commit aed74cc

Browse files
cjihrigBridgeAR
authored andcommitted
deps: upgrade to libuv 1.29.1
Notable changes: - uv_get_constrained_memory() has been added. - A race condition in uv_async_send() has been fixed. - uv_get_free_memory() and uv_get_total_memory() now read from /proc/meminfo, which should improve correctness when called from inside an lxc container. - A failed assertion in uv_fs_poll_stop() has been fixed. - A bug in MAC addresses for IP-aliases has been fixed. Fixes: #27170 Fixes: #27493 PR-URL: #27718 Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 594c986 commit aed74cc

39 files changed

+596
-76
lines changed

deps/uv/.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ Yuki Okumura <mjt@cltn.org>
4646
jBarz <jBarz@users.noreply.github.com> <jbarboza@ca.ibm.com>
4747
jBarz <jBarz@users.noreply.github.com> <jbarz@users.noreply.github.com>
4848
ptlomholt <pt@lomholt.com>
49+
zlargon <zlargon1988@gmail.com>

deps/uv/AUTHORS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,3 +376,9 @@ Rich Trott <rtrott@gmail.com>
376376
Milad Farazmand <miladfar@ca.ibm.com>
377377
zlargon <zlargon1988@gmail.com>
378378
Yury Selivanov <yury@magic.io>
379+
Oscar Waddell <owaddell@beckman.com>
380+
FX Coudert <fxcoudert@gmail.com>
381+
George Zhao <zhaozg@gmail.com>
382+
Kyle Edwards <kyle.edwards@kitware.com>
383+
ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
384+
Kelvin Jin <kelvinjin@google.com>

deps/uv/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
297297
src/unix/linux-inotify.c
298298
src/unix/linux-syscalls.c
299299
src/unix/procfs-exepath.c
300-
src/unix/sysinfo-loadavg.c
301-
src/unix/sysinfo-memory.c)
300+
src/unix/sysinfo-loadavg.c)
302301
endif()
303302

304303
if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")

deps/uv/ChangeLog

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,59 @@
1+
2019.05.22, Version 1.29.1 (Stable), d16e6094e1eb3b0b5981ef1dd7e03ec4d466944d
2+
3+
Changes since version 1.29.0:
4+
5+
* unix: simplify uv/posix.h include logic (cjihrig)
6+
7+
* test: increase test timeout (cjihrig)
8+
9+
* linux: fix sscanf() overflows reading from /proc (Ben Noordhuis)
10+
11+
12+
2019.05.16, Version 1.29.0 (Stable), 43957efd92c167b352b4c948b617ca7afbee0ed1
13+
14+
Changes since version 1.28.0:
15+
16+
* ibmi: read memory and CPU usage info (Xu Meng)
17+
18+
* doc: update the cmake testing instruction (zlargon)
19+
20+
* unix: fix race condition in uv_async_send() (Ben Noordhuis)
21+
22+
* linux: use O_CLOEXEC instead of EPOLL_CLOEXEC (Ben Noordhuis)
23+
24+
* doc: mark uv_async_send() as async-signal-safe (Ben Noordhuis)
25+
26+
* linux: init st_flags and st_gen when using statx (Oscar Waddell)
27+
28+
* linux: read free/total memory from /proc/meminfo (Ben Noordhuis)
29+
30+
* test: test zero-sized uv_fs_sendfile() writes (Ben Noordhuis)
31+
32+
* unix: don't assert on UV_PROCESS_WINDOWS_* flags (Ben Noordhuis)
33+
34+
* linux: set correct mac address for IP-aliases (Santiago Gimeno)
35+
36+
* win,util: fix null pointer dereferencing (Tobias Nießen)
37+
38+
* unix,win: fix `uv_fs_poll_stop()` when active (Anna Henningsen)
39+
40+
* doc: add missing uv_fs_type entries (Michele Caini)
41+
42+
* doc: fix build with sphinx 2.x (FX Coudert)
43+
44+
* unix: don't make statx system call on Android (George Zhao)
45+
46+
* unix: fix clang scan-build warning (Kyle Edwards)
47+
48+
* unix: fall back to kqueue on older macOS systems (ken-cunningham-webuse)
49+
50+
* unix,win: add uv_get_constrained_memory() (Kelvin Jin)
51+
52+
* darwin: fix thread cancellation fd leak (Ben Noordhuis)
53+
54+
* linux: fix thread cancellation fd leak (Ben Noordhuis)
55+
56+
157
2019.04.16, Version 1.28.0 (Stable), 7bf8fabfa934660ee0fe889f78e151198a1165fc
258

359
Changes since version 1.27.0:

deps/uv/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,8 +425,7 @@ libuv_la_SOURCES += src/unix/linux-core.c \
425425
src/unix/linux-syscalls.h \
426426
src/unix/procfs-exepath.c \
427427
src/unix/proctitle.c \
428-
src/unix/sysinfo-loadavg.c \
429-
src/unix/sysinfo-memory.c
428+
src/unix/sysinfo-loadavg.c
430429
test_run_tests_LDFLAGS += -lutil
431430
endif
432431

deps/uv/README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,14 @@ $ make install
172172
To build with [CMake](https://cmake.org/):
173173

174174
```bash
175-
$ mkdir -p out/cmake ; cd out/cmake ; cmake -DBUILD_TESTING=ON ../..
176-
$ make all test
177-
# Or manually:
178-
$ ./uv_run_tests # shared library build
179-
$ ./uv_run_tests_a # static library build
175+
$ mkdir -p out/cmake ; cd out/cmake # create build directory
176+
$ cmake ../.. -DBUILD_TESTING=ON # generate project with test
177+
$ cmake --build . # build
178+
$ ctest -C Debug --output-on-failure # run tests
179+
180+
# Or manually run tests:
181+
$ ./out/cmake/uv_run_tests # shared library build
182+
$ ./out/cmake/uv_run_tests_a # static library build
180183
```
181184

182185
To build with GYP, first run:

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], [1.28.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.29.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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ API
5050
It's safe to call this function from any thread. The callback will be called on the
5151
loop thread.
5252
53+
.. note::
54+
:c:func:`uv_async_send` is `async-signal-safe <http://man7.org/linux/man-pages/man7/signal-safety.7.html>`_.
55+
It's safe to call this function from a signal handler.
56+
5357
.. warning::
5458
libuv will coalesce calls to :c:func:`uv_async_send`, that is, not every call to it will
5559
yield an execution of the callback. For example: if :c:func:`uv_async_send` is called 5

deps/uv/docs/src/fs.rst

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,10 @@ Data types
9696
UV_FS_FCHOWN,
9797
UV_FS_REALPATH,
9898
UV_FS_COPYFILE,
99-
UV_FS_LCHOWN
99+
UV_FS_LCHOWN,
100+
UV_FS_OPENDIR,
101+
UV_FS_READDIR,
102+
UV_FS_CLOSEDIR
100103
} uv_fs_type;
101104

102105
.. c:type:: uv_dirent_t

deps/uv/docs/src/misc.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,19 @@ API
461461
462462
Gets memory information (in bytes).
463463
464+
.. c:function:: uint64_t uv_get_constrained_memory(void)
465+
466+
Gets the amount of memory available to the process (in bytes) based on
467+
limits imposed by the OS. If there is no such constraint, or the constraint
468+
is unknown, `0` is returned. Note that it is not unusual for this value to
469+
be less than or greater than :c:func:`uv_get_total_memory`.
470+
471+
.. note::
472+
This function currently only returns a non-zero value on Linux, based
473+
on cgroups if it is present.
474+
475+
.. versionadded:: 1.29.0
476+
464477
.. c:function:: uint64_t uv_hrtime(void)
465478
466479
Returns the current high-resolution real time. This is expressed in

0 commit comments

Comments
 (0)