Revert "deps: upgrade to libuv 1.46.0"

This reverts commit 88855e0. PR-URL: #50036 Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ruy Adorno <ruyadorno@google.com>
nodejs · Oct 6, 2023 · 022352a · 022352a
1 parent 3e3a75c
commit 022352a
Show file tree

Hide file tree

Showing 65 changed files with 764 additions and 1,528 deletions.
diff --git a/deps/uv/.readthedocs.yaml b/deps/uv/.readthedocs.yaml
@@ -6,7 +6,6 @@ sphinx:
   fail_on_warning: false
 
 build:
-  os: "ubuntu-22.04"
   tools:
     python: "3.9"
 

diff --git a/deps/uv/AUTHORS b/deps/uv/AUTHORS
@@ -542,9 +542,3 @@ Lewis Russell <me@lewisr.dev>
 sivadeilra <arlie.davis@gmail.com>
 cui fliter <imcusg@gmail.com>
 Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
-Niklas Mischkulnig <4586894+mischnic@users.noreply.github.com>
-Stefan Karpinski <stefan@karpinski.org>
-liuxiang88 <94350585+liuxiang88@users.noreply.github.com>
-Jeffrey H. Johnson <trnsz@pobox.com>
-Abdirahim Musse <33973272+abmusse@users.noreply.github.com>
-小明 <7737673+caobug@users.noreply.github.com>
diff --git a/deps/uv/ChangeLog b/deps/uv/ChangeLog
@@ -1,63 +1,4 @@
-2023.06.30, Version 1.46.0 (Stable)
-
-Changes since version 1.45.0:
-
-* Add SHA to ChangeLog (Santiago Gimeno)
-
-* misc: update readthedocs config (Jameson Nash)
-
-* test: remove erroneous RETURN_SKIP (Ben Noordhuis)
-
-* android: disable io_uring support (Ben Noordhuis)
-
-* linux: add some more iouring backed fs ops (Santiago Gimeno)
-
-* build: add autoconf option for disable-maintainer-mode (Jameson Nash)
-
-* fs: use WTF-8 on Windows (Stefan Karpinski)
-
-* unix,win: replace QUEUE with struct uv__queue (Ben Noordhuis)
-
-* linux: fs_read to use io_uring if iovcnt > IOV_MAX (Santiago Gimeno)
-
-* ios: fix uv_getrusage() ru_maxrss calculation (Ben Noordhuis)
-
-* include: update outdated code comment (Ben Noordhuis)
-
-* linux: support abstract unix sockets (Ben Noordhuis)
-
-* unix,win: add UV_PIPE_NO_TRUNCATE flag (Ben Noordhuis)
-
-* unix: add loongarch support (liuxiang88)
-
-* doc: add DPS8M to LINKS.md (Jeffrey H. Johnson)
-
-* include: add EUNATCH errno mapping (Abdirahim Musse)
-
-* src: don't run timers if loop is stopped/unref'd (Trevor Norris)
-
-* win: fix -Wpointer-to-int-cast warning (Ben Noordhuis)
-
-* test,win: fix -Wunused-variable warning (Ben Noordhuis)
-
-* test,win: fix -Wformat warning (Ben Noordhuis)
-
-* linux: work around io_uring IORING_OP_CLOSE bug (Ben Noordhuis)
-
-* win: remove unused functions (Ben Noordhuis)
-
-* bench: add bench to check uv_loop_alive (Trevor Norris)
-
-* test: add uv_cancel test for threadpool (Trevor Norris)
-
-* unix: skip prohibited syscalls on tvOS and watchOS (小明)
-
-* unix,fs: make no_pwritev access thread-safe (Santiago Gimeno)
-
-* unix: fix build for lower versions of Android (小明)
-
-
-2023.05.19, Version 1.45.0 (Stable), 96e05543f53b19d9642b4b0dd73b86ad3cea313e
+2023.05.19, Version 1.45.0 (Stable)
 
 Changes since version 1.44.2:
 

diff --git a/deps/uv/LINKS.md b/deps/uv/LINKS.md
@@ -6,8 +6,7 @@
 * [clearskies_core](https://github.com/larroy/clearskies_core): Clearskies file synchronization program. (C++11)
 * [CMake](https://cmake.org) open-source, cross-platform family of tools designed to build, test and package software
 * [Cocos-Engine](https://github.com/cocos/cocos-engine): The runtime framework for Cocos Creator editor.
-* [Coherence](https://github.com/liesware/coherence/): Cryptographic server for modern web apps.
-* [DPS8M](https://dps8m.gitlab.io): GE ∕ Honeywell ∕ Bull DPS‑8/M and 6180/L68 mainframe simulator.
+* [Coherence](https://github.com/liesware/coherence/): Cryptographic server for modern web apps. 
 * [DPS-For-IoT](https://github.com/intel/dps-for-iot/wiki): Fully distributed publish/subscribe protocol.
 * [HashLink](https://github.com/HaxeFoundation/hashlink): Haxe run-time with libuv support included.
 * [Haywire](https://github.com/kellabyte/Haywire): Asynchronous HTTP server.

diff --git a/deps/uv/configure.ac b/deps/uv/configure.ac
@@ -13,13 +13,12 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libuv], [1.46.0], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.45.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])
 m4_include([m4/libuv-check-flags.m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects] UV_EXTRA_AUTOMAKE_FLAGS)
-AM_MAINTAINER_MODE([enable]) # pass --disable-maintainer-mode if autotools may be unavailable
 AC_CANONICAL_HOST
 AC_ENABLE_SHARED
 AC_ENABLE_STATIC

diff --git a/deps/uv/docs/src/errors.rst b/deps/uv/docs/src/errors.rst
@@ -339,9 +339,6 @@ Error constants
 
     socket type not supported
 
-.. c:macro:: UV_EUNATCH
-
-    protocol driver not attached
 
 API
 ---

diff --git a/deps/uv/docs/src/pipe.rst b/deps/uv/docs/src/pipe.rst
@@ -55,61 +55,17 @@ API
 
     Bind the pipe to a file path (Unix) or a name (Windows).
 
-    Does not support Linux abstract namespace sockets,
-    unlike :c:func:`uv_pipe_bind2`.
-
-    Alias for ``uv_pipe_bind2(handle, name, strlen(name), 0)``.
-
-    .. note::
-        Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
-        typically between 92 and 108 bytes.
-
-.. c:function:: int uv_pipe_bind2(uv_pipe_t* handle, const char* name, size_t namelen, unsigned int flags)
-
-    Bind the pipe to a file path (Unix) or a name (Windows).
-
-    ``flags`` must be zero or ``UV_PIPE_NO_TRUNCATE``. Returns ``UV_EINVAL``
-    for unsupported flags without performing the bind operation.
-
-    Supports Linux abstract namespace sockets. ``namelen`` must include
-    the leading nul byte but not the trailing nul byte.
-
-    .. versionadded:: 1.46.0
-
     .. note::
-        Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
-        typically between 92 and 108 bytes, unless the ``UV_PIPE_NO_TRUNCATE``
-        flag is specified, in which case an ``UV_EINVAL`` error is returned.
+        Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes, typically between
+        92 and 108 bytes.
 
 .. c:function:: void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, const char* name, uv_connect_cb cb)
 
-    Connect to the Unix domain socket or the Windows named pipe.
-
-    Does not support Linux abstract namespace sockets,
-    unlike :c:func:`uv_pipe_connect2`.
-
-    Alias for ``uv_pipe_connect2(req, handle, name, strlen(name), 0, cb)``.
-
-    .. note::
-        Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
-        typically between 92 and 108 bytes.
-
-.. c:function:: void uv_pipe_connect2(uv_connect_t* req, uv_pipe_t* handle, const char* name, size_t namelen, unsigned int flags, uv_connect_cb cb)
-
-    Connect to the Unix domain socket or the Windows named pipe.
-
-    ``flags`` must be zero or ``UV_PIPE_NO_TRUNCATE``. Returns ``UV_EINVAL``
-    for unsupported flags without performing the connect operation.
-
-    Supports Linux abstract namespace sockets. ``namelen`` must include
-    the leading nul byte but not the trailing nul byte.
-
-    .. versionadded:: 1.46.0
+    Connect to the Unix domain socket or the named pipe.
 
     .. note::
-        Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
-        typically between 92 and 108 bytes, unless the ``UV_PIPE_NO_TRUNCATE``
-        flag is specified, in which case an ``UV_EINVAL`` error is returned.
+        Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes, typically between
+        92 and 108 bytes.
 
 .. c:function:: int uv_pipe_getsockname(const uv_pipe_t* handle, char* buffer, size_t* size)
 

diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
@@ -59,12 +59,6 @@ extern "C" {
 #include <stdio.h>
 #include <stdint.h>
 
-/* Internal type, do not use. */
-struct uv__queue {
-  struct uv__queue* next;
-  struct uv__queue* prev;
-};
-
 #if defined(_WIN32)
 # include "uv/win.h"
 #else
@@ -156,7 +150,6 @@ struct uv__queue {
   XX(EILSEQ, "illegal byte sequence")                                         \
   XX(ESOCKTNOSUPPORT, "socket type not supported")                            \
   XX(ENODATA, "no data available")                                            \
-  XX(EUNATCH, "protocol driver not attached")                                 \
 
 #define UV_HANDLE_TYPE_MAP(XX)                                                \
   XX(ASYNC, async)                                                            \
@@ -290,13 +283,13 @@ UV_EXTERN int uv_loop_init(uv_loop_t* loop);
 UV_EXTERN int uv_loop_close(uv_loop_t* loop);
 /*
  * NOTE:
- *  This function is DEPRECATED, users should
+ *  This function is DEPRECATED (to be removed after 0.12), users should
  *  allocate the loop manually and use uv_loop_init instead.
  */
 UV_EXTERN uv_loop_t* uv_loop_new(void);
 /*
  * NOTE:
- *  This function is DEPRECATED. Users should use
+ *  This function is DEPRECATED (to be removed after 0.12). Users should use
  *  uv_loop_close and free the memory manually instead.
  */
 UV_EXTERN void uv_loop_delete(uv_loop_t*);
@@ -466,7 +459,7 @@ struct uv_shutdown_s {
   uv_handle_type type;                                                        \
   /* private */                                                               \
   uv_close_cb close_cb;                                                       \
-  struct uv__queue handle_queue;                                              \
+  void* handle_queue[2];                                                      \
   union {                                                                     \
     int fd;                                                                   \
     void* reserved[4];                                                        \
@@ -808,10 +801,6 @@ inline int uv_tty_set_mode(uv_tty_t* handle, int mode) {
 
 UV_EXTERN uv_handle_type uv_guess_handle(uv_file file);
 
-enum {
-  UV_PIPE_NO_TRUNCATE = 1u << 0
-};
-
 /*
  * uv_pipe_t is a subclass of uv_stream_t.
  *
@@ -828,20 +817,10 @@ struct uv_pipe_s {
 UV_EXTERN int uv_pipe_init(uv_loop_t*, uv_pipe_t* handle, int ipc);
 UV_EXTERN int uv_pipe_open(uv_pipe_t*, uv_file file);
 UV_EXTERN int uv_pipe_bind(uv_pipe_t* handle, const char* name);
-UV_EXTERN int uv_pipe_bind2(uv_pipe_t* handle,
-                            const char* name,
-                            size_t namelen,
-                            unsigned int flags);
 UV_EXTERN void uv_pipe_connect(uv_connect_t* req,
                                uv_pipe_t* handle,
                                const char* name,
                                uv_connect_cb cb);
-UV_EXTERN int uv_pipe_connect2(uv_connect_t* req,
-                               uv_pipe_t* handle,
-                               const char* name,
-                               size_t namelen,
-                               unsigned int flags,
-                               uv_connect_cb cb);
 UV_EXTERN int uv_pipe_getsockname(const uv_pipe_t* handle,
                                   char* buffer,
                                   size_t* size);
@@ -1870,7 +1849,7 @@ struct uv_loop_s {
   void* data;
   /* Loop reference counting. */
   unsigned int active_handles;
-  struct uv__queue handle_queue;
+  void* handle_queue[2];
   union {
     void* unused;
     unsigned int count;

diff --git a/deps/uv/include/uv/darwin.h b/deps/uv/include/uv/darwin.h
@@ -40,16 +40,16 @@
   void* cf_state;                                                             \
   uv_mutex_t cf_mutex;                                                        \
   uv_sem_t cf_sem;                                                            \
-  struct uv__queue cf_signals;                                                \
+  void* cf_signals[2];                                                        \
 
 #define UV_PLATFORM_FS_EVENT_FIELDS                                           \
   uv__io_t event_watcher;                                                     \
   char* realpath;                                                             \
   int realpath_len;                                                           \
   int cf_flags;                                                               \
   uv_async_t* cf_cb;                                                          \
-  struct uv__queue cf_events;                                                 \
-  struct uv__queue cf_member;                                                 \
+  void* cf_events[2];                                                         \
+  void* cf_member[2];                                                         \
   int cf_error;                                                               \
   uv_mutex_t cf_mutex;                                                        \
 

diff --git a/deps/uv/include/uv/errno.h b/deps/uv/include/uv/errno.h
@@ -468,10 +468,4 @@
 # define UV__ENODATA (-4024)
 #endif
 
-#if defined(EUNATCH) && !defined(_WIN32)
-# define UV__EUNATCH UV__ERR(EUNATCH)
-#else
-# define UV__EUNATCH (-4023)
-#endif
-
 #endif /* UV_ERRNO_H_ */
diff --git a/deps/uv/include/uv/linux.h b/deps/uv/include/uv/linux.h
@@ -28,7 +28,7 @@
   int inotify_fd;                                                             \
 
 #define UV_PLATFORM_FS_EVENT_FIELDS                                           \
-  struct uv__queue watchers;                                                  \
+  void* watchers[2];                                                          \
   int wd;                                                                     \
 
 #endif /* UV_LINUX_H */
diff --git a/deps/uv/include/uv/threadpool.h b/deps/uv/include/uv/threadpool.h
@@ -31,7 +31,7 @@ struct uv__work {
   void (*work)(struct uv__work *w);
   void (*done)(struct uv__work *w, int status);
   struct uv_loop_s* loop;
-  struct uv__queue wq;
+  void* wq[2];
 };
 
 #endif /* UV_THREADPOOL_H_ */
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ sphinx: @@
       fail_on_warning: false
     build:
-      os: "ubuntu-22.04"
       tools:
         python: "3.9"
@@ Expand Down @@