deps: upgrade to libuv 1.22.0

Backport-PR-URL: #24103 PR-URL: #21731 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Nov 11, 2018 · e3d08af · e3d08af
1 parent 11cb09b
commit e3d08af
Show file tree

Hide file tree

Showing 51 changed files with 527 additions and 890 deletions.
diff --git a/deps/uv/AUTHORS b/deps/uv/AUTHORS
@@ -343,3 +343,5 @@ Björn Linse <bjorn.linse@gmail.com>
 zyxwvu Shi <i@shiyc.cn>
 Peter Johnson <johnson.peter@gmail.com>
 Paolo Greppi <paolo.greppi@libpf.com>
+Shelley Vohr <shelley.vohr@gmail.com>
+Ujjwal Sharma <usharma1998@gmail.com>
diff --git a/deps/uv/CMakeLists.txt b/deps/uv/CMakeLists.txt
@@ -15,6 +15,7 @@ set(uv_sources
     src/fs-poll.c
     src/inet.c
     src/threadpool.c
+    src/timer.c
     src/uv-common.c
     src/uv-data-getter-setters.c
     src/version.c)
@@ -197,7 +198,6 @@ if(WIN32)
        src/win/stream.c
        src/win/tcp.c
        src/win/tty.c
-       src/win/timer.c
        src/win/udp.c
        src/win/util.c
        src/win/winapi.c
@@ -223,7 +223,6 @@ else()
        src/unix/stream.c
        src/unix/tcp.c
        src/unix/thread.c
-       src/unix/timer.c
        src/unix/tty.c
        src/unix/udp.c)
   list(APPEND uv_test_sources test/runner-unix.c)

diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog
@@ -1,3 +1,36 @@
+2018.07.11, Version 1.22.0 (Stable), 8568f78a777d79d35eb7d6994617267b9fb33967
+
+Changes since version 1.21.0:
+
+* unix: remove checksparse.sh (Ben Noordhuis)
+
+* win: fix mingw build error (Ben Noordhuis)
+
+* win: fix -Wunused-function warnings in thread.c (Ben Noordhuis)
+
+* unix,win: merge timers implementation (Ben Noordhuis)
+
+* win: fix pointer type in pipe.c (Ben Noordhuis)
+
+* win: fixing build for older MSVC compilers (Michael Fero)
+
+* zos: clear poll events on every iteration (jBarz)
+
+* zos: write-protect message queue (jBarz)
+
+* zos: use correct pointer type in strnlen (jBarz)
+
+* unix,win: merge handle flags (Ben Noordhuis)
+
+* doc: update Imran Iqbal's GitHub handle (cjihrig)
+
+* src: add new error apis to prevent memory leaks (Shelley Vohr)
+
+* test: make test-condvar call uv_cond_wait (Jamie Davis)
+
+* fs: change position of uv_fs_lchown (Ujjwal Sharma)
+
+
 2018.06.23, Version 1.21.0 (Stable), e4983a9b0c152932f7553ff4a9ff189d2314cdcb
 
 Changes since version 1.20.3:

diff --git a/deps/uv/MAINTAINERS.md b/deps/uv/MAINTAINERS.md
@@ -12,7 +12,7 @@ libuv is currently managed by the following individuals:
   - GPG key: 5735 3E0D BDAA A7E8 39B6  6A1A FF47 D5E4 AD8B 4FDC (pubkey-cjihrig-kb)
 * **Fedor Indutny** ([@indutny](https://github.com/indutny))
   - GPG key: AF2E EA41 EC34 47BF DD86  FED9 D706 3CCE 19B7 E890 (pubkey-indutny)
-* **Imran Iqbal** ([@iWuzHere](https://github.com/iWuzHere))
+* **Imran Iqbal** ([@imran-iq](https://github.com/imran-iq))
   - GPG key: 9DFE AA5F 481B BF77 2D90  03CE D592 4925 2F8E C41A (pubkey-iwuzhere)
 * **John Barboza** ([@jbarz](https://github.com/jbarz))
 * **Santiago Gimeno** ([@santigimeno](https://github.com/santigimeno))

diff --git a/deps/uv/Makefile.am b/deps/uv/Makefile.am
@@ -32,6 +32,7 @@ libuv_la_SOURCES = src/fs-poll.c \
                    src/inet.c \
                    src/queue.h \
                    src/threadpool.c \
+                   src/timer.c \
                    src/uv-data-getter-setters.c \
                    src/uv-common.c \
                    src/uv-common.h \
@@ -74,7 +75,6 @@ libuv_la_SOURCES += src/win/async.c \
                     src/win/stream-inl.h \
                     src/win/tcp.c \
                     src/win/thread.c \
-                    src/win/timer.c \
                     src/win/tty.c \
                     src/win/udp.c \
                     src/win/util.c \
@@ -105,7 +105,6 @@ libuv_la_SOURCES += src/unix/async.c \
                    src/unix/stream.c \
                    src/unix/tcp.c \
                    src/unix/thread.c \
-                   src/unix/timer.c \
                    src/unix/tty.c \
                    src/unix/udp.c
 

diff --git a/deps/uv/checksparse.sh b/deps/uv/checksparse.sh
diff --git a/deps/uv/configure.ac b/deps/uv/configure.ac
@@ -13,7 +13,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libuv], [1.21.0], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.22.0], [https://github.com/libuv/libuv/issues])
 AC_CONFIG_MACRO_DIR([m4])
 m4_include([m4/libuv-extra-automake-flags.m4])
 m4_include([m4/as_case.m4])

diff --git a/deps/uv/docs/src/errors.rst b/deps/uv/docs/src/errors.rst
@@ -335,11 +335,25 @@ API
     Returns the error message for the given error code.  Leaks a few bytes
     of memory when you call it with an unknown error code.
 
+.. c:function:: char* uv_strerror_r(int err, char* buf, size_t buflen)
+
+    Returns the error message for the given error code. The zero-terminated
+    message is stored in the user-supplied buffer `buf` of at most `buflen` bytes.
+
+    .. versionadded:: 1.22.0
+
 .. c:function:: const char* uv_err_name(int err)
 
     Returns the error name for the given error code.  Leaks a few bytes
     of memory when you call it with an unknown error code.
 
+.. c:function:: char* uv_err_name_r(int err, char* buf, size_t buflen)
+
+    Returns the error name for the given error code. The zero-terminated
+    name is stored in the user-supplied buffer `buf` of at most `buflen` bytes.
+
+    .. versionadded:: 1.22.0
+
 .. c:function:: int uv_translate_sys_error(int sys_errno)
 
    Returns the libuv error code equivalent to the given platform dependent error