diff options
| author | cjihrig <cjihrig@gmail.com> | 2019-05-15 13:24:08 -0400 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2019-05-21 10:37:14 -0400 |
| commit | 46d8af5e618554fcac89e4b15bf06f81de36ef54 (patch) | |
| tree | 2c4e88611012eadb6ad054513357d0b957272592 /deps/uv/src/unix/darwin.c | |
| parent | 0ca9297c3945f52325fcd08afe3fb9dfe3adf123 (diff) | |
| download | android-node-v8-46d8af5e618554fcac89e4b15bf06f81de36ef54.tar.gz android-node-v8-46d8af5e618554fcac89e4b15bf06f81de36ef54.tar.bz2 android-node-v8-46d8af5e618554fcac89e4b15bf06f81de36ef54.zip | |
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: https://github.com/nodejs/node/issues/27170
Fixes: https://github.com/nodejs/node/issues/27493
PR-URL: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'deps/uv/src/unix/darwin.c')
| -rw-r--r-- | deps/uv/src/unix/darwin.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/deps/uv/src/unix/darwin.c b/deps/uv/src/unix/darwin.c index 31ad8a9e48..e4cd8ff7e0 100644 --- a/deps/uv/src/unix/darwin.c +++ b/deps/uv/src/unix/darwin.c @@ -117,6 +117,11 @@ uint64_t uv_get_total_memory(void) { } +uint64_t uv_get_constrained_memory(void) { + return 0; /* Memory constraints are unknown. */ +} + + void uv_loadavg(double avg[3]) { struct loadavg info; size_t size = sizeof(info); |