Skip to content

Commit c38f926

Browse files
cjihrigaddaleax
cjihrig
authored and
addaleax
committed
deps: upgrade to libuv 1.38.1
Notable changes: - A probable compiler bug in VS2019 was causing a failed assertion in libuv which appeared to the user as though the system clock was drifting. The `uv_hrtime()` code on Windows has been rearranged to work around the issue. - On Linux, `uv_loadavg()` attempts to read from `/proc/loadavg` before falling back to calling `sysinfo()`. This works around a bug in LXC. - A deadlock in the Windows TTY code has been fixed. - An issue on macOS related to monotonic clocks jumping back in time has been worked around. PR-URL: #34187 Reviewed-By: David Carlier <[email protected]> Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Jiawen Geng <[email protected]> Reviewed-By: Bartosz Sosnowski <[email protected]>
1 parent ab1b30b commit c38f926

28 files changed

+774
-148
lines changed

‎deps/uv/AUTHORS

+3
Original file line numberDiff line numberDiff line change
@@ -432,3 +432,6 @@ Philip Chimento <[email protected]>
432432
Michal Artazov <[email protected]>
433433
Jeroen Roovers <[email protected]>
434434
MasterDuke17 <[email protected]>
435+
Alexander Tokmakov <[email protected]>
436+
Arenoros <[email protected]>
437+
lander0s <[email protected]>

‎deps/uv/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "AIX")
182182
endif()
183183

184184
if(CMAKE_SYSTEM_NAME STREQUAL "Android")
185+
list(APPEND uv_defines _GNU_SOURCE)
185186
list(APPEND uv_libraries dl)
186187
list(APPEND uv_sources
187188
src/unix/android-ifaddrs.c
@@ -192,8 +193,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Android")
192193
src/unix/pthread-fixes.c
193194
src/unix/random-getentropy.c
194195
src/unix/random-getrandom.c
195-
src/unix/random-sysctl-linux.c
196-
src/unix/sysinfo-loadavg.c)
196+
src/unix/random-sysctl-linux.c)
197197
endif()
198198

199199
if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "Android|Linux|OS390")
@@ -206,7 +206,6 @@ endif()
206206

207207
if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD")
208208
list(APPEND uv_sources src/unix/posix-hrtime.c src/unix/bsd-proctitle.c)
209-
list(APPEND uv_libraries kvm)
210209
endif()
211210

212211
if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD")
@@ -238,12 +237,12 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
238237
src/unix/linux-syscalls.c
239238
src/unix/procfs-exepath.c
240239
src/unix/random-getrandom.c
241-
src/unix/random-sysctl-linux.c
242-
src/unix/sysinfo-loadavg.c)
240+
src/unix/random-sysctl-linux.c)
243241
endif()
244242

245243
if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
246244
list(APPEND uv_sources src/unix/netbsd.c)
245+
list(APPEND uv_libraries kvm)
247246
endif()
248247

249248
if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
@@ -510,6 +509,7 @@ if(LIBUV_BUILD_TESTS)
510509
test/test-udp-send-and-recv.c
511510
test/test-udp-send-hang-loop.c
512511
test/test-udp-send-immediate.c
512+
test/test-udp-sendmmsg-error.c
513513
test/test-udp-send-unreachable.c
514514
test/test-udp-try-send.c
515515
test/test-uname.c

‎deps/uv/ChangeLog

+39
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,42 @@
1+
2020.07.04, Version 1.38.1 (Stable), e8b989ea1f7f9d4083511a2caec7791e9abd1871
2+
3+
Changes since version 1.38.0:
4+
5+
* test: use last matching qemu version (cjihrig)
6+
7+
* win, util: rearrange uv_hrtime (Bartosz Sosnowski)
8+
9+
* test: skip signal_multiple_loops test on QEMU (gengjiawen)
10+
11+
* build: add android build to CI (gengjiawen)
12+
13+
* test: extend fs_event_error_reporting timeout (cjihrig)
14+
15+
* build: link libkvm on netbsd only (Alexander Tokmakov)
16+
17+
* linux: refactor /proc file reader logic (Ben Noordhuis)
18+
19+
* linux: read load average from /proc/loadavg (Ben Noordhuis)
20+
21+
* android: remove patch code for below 21 (gengjiawen)
22+
23+
* win: fix visual studio 2008 build (Arenoros)
24+
25+
* win,tty: fix deadlock caused by inconsistent state (lander0s)
26+
27+
* unix: use relaxed loads/stores for feature checks (Ben Noordhuis)
28+
29+
* build: don't .gitignore m4/ax_pthread.m4 (Ben Noordhuis)
30+
31+
* unix: fix gcc atomics feature check (Ben Noordhuis)
32+
33+
* darwin: work around clock jumping back in time (Ben Noordhuis)
34+
35+
* udp: fix write_queue cleanup on sendmmsg error (Santiago Gimeno)
36+
37+
* src: build fix for Android (David Carlier)
38+
39+
140
2020.05.18, Version 1.38.0 (Stable), 1ab9ea3790378f9f25c4e78e9e2b511c75f9c9ed
241

342
Changes since version 1.37.0:

‎deps/uv/Makefile.am

+4-4
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ test_run_tests_SOURCES = test/blackhole-server.c \
296296
test/test-udp-send-and-recv.c \
297297
test/test-udp-send-hang-loop.c \
298298
test/test-udp-send-immediate.c \
299+
test/test-udp-sendmmsg-error.c \
299300
test/test-udp-send-unreachable.c \
300301
test/test-udp-try-send.c \
301302
test/test-uname.c \
@@ -379,15 +380,15 @@ endif
379380

380381
if ANDROID
381382
uvinclude_HEADERS += include/uv/android-ifaddrs.h
383+
libuv_la_CFLAGS += -D_GNU_SOURCE
382384
libuv_la_SOURCES += src/unix/android-ifaddrs.c \
383385
src/unix/linux-core.c \
384386
src/unix/linux-inotify.c \
385387
src/unix/linux-syscalls.c \
386388
src/unix/procfs-exepath.c \
387389
src/unix/pthread-fixes.c \
388390
src/unix/random-getrandom.c \
389-
src/unix/random-sysctl-linux.c \
390-
src/unix/sysinfo-loadavg.c
391+
src/unix/random-sysctl-linux.c
391392
endif
392393

393394
if CYGWIN
@@ -468,8 +469,7 @@ libuv_la_SOURCES += src/unix/linux-core.c \
468469
src/unix/procfs-exepath.c \
469470
src/unix/proctitle.c \
470471
src/unix/random-getrandom.c \
471-
src/unix/random-sysctl-linux.c \
472-
src/unix/sysinfo-loadavg.c
472+
src/unix/random-sysctl-linux.c
473473
test_run_tests_LDFLAGS += -lutil
474474
endif
475475

‎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.38.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.38.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/include/uv/version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#define UV_VERSION_MAJOR 1
3434
#define UV_VERSION_MINOR 38
35-
#define UV_VERSION_PATCH 0
35+
#define UV_VERSION_PATCH 1
3636
#define UV_VERSION_IS_RELEASE 1
3737
#define UV_VERSION_SUFFIX ""
3838

‎deps/uv/m4/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Ignore libtoolize-generated files.
22
*.m4
33
!as_case.m4
4+
!ax_pthread.m4
45
!libuv-check-flags.m4

0 commit comments

Comments
 (0)