Skip to content

Commit 022352a

Browse files
richardlaurichardlau
committed
Revert "deps: upgrade to libuv 1.46.0"
This reverts commit 88855e0. PR-URL: #50036 Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Ruy Adorno <[email protected]>
1 parent 3e3a75c commit 022352a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+764
-1528
lines changed

‎deps/uv/.readthedocs.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ sphinx:
66
fail_on_warning: false
77

88
build:
9-
os: "ubuntu-22.04"
109
tools:
1110
python: "3.9"
1211

‎deps/uv/AUTHORS

-6
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,3 @@ Lewis Russell <[email protected]>
542542
sivadeilra <[email protected]>
543543
cui fliter <[email protected]>
544544
Mohammed Keyvanzadeh <[email protected]>
545-
Niklas Mischkulnig <[email protected]>
546-
Stefan Karpinski <[email protected]>
547-
liuxiang88 <[email protected]>
548-
Jeffrey H. Johnson <[email protected]>
549-
Abdirahim Musse <[email protected]>
550-
小明 <[email protected]>

‎deps/uv/ChangeLog

+1-60
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,4 @@
1-
2023.06.30, Version 1.46.0 (Stable)
2-
3-
Changes since version 1.45.0:
4-
5-
* Add SHA to ChangeLog (Santiago Gimeno)
6-
7-
* misc: update readthedocs config (Jameson Nash)
8-
9-
* test: remove erroneous RETURN_SKIP (Ben Noordhuis)
10-
11-
* android: disable io_uring support (Ben Noordhuis)
12-
13-
* linux: add some more iouring backed fs ops (Santiago Gimeno)
14-
15-
* build: add autoconf option for disable-maintainer-mode (Jameson Nash)
16-
17-
* fs: use WTF-8 on Windows (Stefan Karpinski)
18-
19-
* unix,win: replace QUEUE with struct uv__queue (Ben Noordhuis)
20-
21-
* linux: fs_read to use io_uring if iovcnt > IOV_MAX (Santiago Gimeno)
22-
23-
* ios: fix uv_getrusage() ru_maxrss calculation (Ben Noordhuis)
24-
25-
* include: update outdated code comment (Ben Noordhuis)
26-
27-
* linux: support abstract unix sockets (Ben Noordhuis)
28-
29-
* unix,win: add UV_PIPE_NO_TRUNCATE flag (Ben Noordhuis)
30-
31-
* unix: add loongarch support (liuxiang88)
32-
33-
* doc: add DPS8M to LINKS.md (Jeffrey H. Johnson)
34-
35-
* include: add EUNATCH errno mapping (Abdirahim Musse)
36-
37-
* src: don't run timers if loop is stopped/unref'd (Trevor Norris)
38-
39-
* win: fix -Wpointer-to-int-cast warning (Ben Noordhuis)
40-
41-
* test,win: fix -Wunused-variable warning (Ben Noordhuis)
42-
43-
* test,win: fix -Wformat warning (Ben Noordhuis)
44-
45-
* linux: work around io_uring IORING_OP_CLOSE bug (Ben Noordhuis)
46-
47-
* win: remove unused functions (Ben Noordhuis)
48-
49-
* bench: add bench to check uv_loop_alive (Trevor Norris)
50-
51-
* test: add uv_cancel test for threadpool (Trevor Norris)
52-
53-
* unix: skip prohibited syscalls on tvOS and watchOS (小明)
54-
55-
* unix,fs: make no_pwritev access thread-safe (Santiago Gimeno)
56-
57-
* unix: fix build for lower versions of Android (小明)
58-
59-
60-
2023.05.19, Version 1.45.0 (Stable), 96e05543f53b19d9642b4b0dd73b86ad3cea313e
1+
2023.05.19, Version 1.45.0 (Stable)
612

623
Changes since version 1.44.2:
634

‎deps/uv/LINKS.md

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

‎deps/uv/configure.ac

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,12 @@
1313
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
1414

1515
AC_PREREQ(2.57)
16-
AC_INIT([libuv], [1.46.0], [https://github.com/libuv/libuv/issues])
16+
AC_INIT([libuv], [1.45.0], [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])
2020
m4_include([m4/libuv-check-flags.m4])
2121
AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects] UV_EXTRA_AUTOMAKE_FLAGS)
22-
AM_MAINTAINER_MODE([enable]) # pass --disable-maintainer-mode if autotools may be unavailable
2322
AC_CANONICAL_HOST
2423
AC_ENABLE_SHARED
2524
AC_ENABLE_STATIC

‎deps/uv/docs/src/errors.rst

-3
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,6 @@ Error constants
339339
340340
socket type not supported
341341

342-
.. c:macro:: UV_EUNATCH
343-
344-
protocol driver not attached
345342

346343
API
347344
---

‎deps/uv/docs/src/pipe.rst

+5-49
Original file line numberDiff line numberDiff line change
@@ -55,61 +55,17 @@ API
5555
5656
Bind the pipe to a file path (Unix) or a name (Windows).
5757
58-
Does not support Linux abstract namespace sockets,
59-
unlike :c:func:`uv_pipe_bind2`.
60-
61-
Alias for ``uv_pipe_bind2(handle, name, strlen(name), 0)``.
62-
63-
.. note::
64-
Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
65-
typically between 92 and 108 bytes.
66-
67-
.. c:function:: int uv_pipe_bind2(uv_pipe_t* handle, const char* name, size_t namelen, unsigned int flags)
68-
69-
Bind the pipe to a file path (Unix) or a name (Windows).
70-
71-
``flags`` must be zero or ``UV_PIPE_NO_TRUNCATE``. Returns ``UV_EINVAL``
72-
for unsupported flags without performing the bind operation.
73-
74-
Supports Linux abstract namespace sockets. ``namelen`` must include
75-
the leading nul byte but not the trailing nul byte.
76-
77-
.. versionadded:: 1.46.0
78-
7958
.. note::
80-
Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
81-
typically between 92 and 108 bytes, unless the ``UV_PIPE_NO_TRUNCATE``
82-
flag is specified, in which case an ``UV_EINVAL`` error is returned.
59+
Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes, typically between
60+
92 and 108 bytes.
8361
8462
.. c:function:: void uv_pipe_connect(uv_connect_t* req, uv_pipe_t* handle, const char* name, uv_connect_cb cb)
8563
86-
Connect to the Unix domain socket or the Windows named pipe.
87-
88-
Does not support Linux abstract namespace sockets,
89-
unlike :c:func:`uv_pipe_connect2`.
90-
91-
Alias for ``uv_pipe_connect2(req, handle, name, strlen(name), 0, cb)``.
92-
93-
.. note::
94-
Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
95-
typically between 92 and 108 bytes.
96-
97-
.. 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)
98-
99-
Connect to the Unix domain socket or the Windows named pipe.
100-
101-
``flags`` must be zero or ``UV_PIPE_NO_TRUNCATE``. Returns ``UV_EINVAL``
102-
for unsupported flags without performing the connect operation.
103-
104-
Supports Linux abstract namespace sockets. ``namelen`` must include
105-
the leading nul byte but not the trailing nul byte.
106-
107-
.. versionadded:: 1.46.0
64+
Connect to the Unix domain socket or the named pipe.
10865
10966
.. note::
110-
Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes,
111-
typically between 92 and 108 bytes, unless the ``UV_PIPE_NO_TRUNCATE``
112-
flag is specified, in which case an ``UV_EINVAL`` error is returned.
67+
Paths on Unix get truncated to ``sizeof(sockaddr_un.sun_path)`` bytes, typically between
68+
92 and 108 bytes.
11369
11470
.. c:function:: int uv_pipe_getsockname(const uv_pipe_t* handle, char* buffer, size_t* size)
11571

‎deps/uv/include/uv.h

+4-25
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ extern "C" {
5959
#include <stdio.h>
6060
#include <stdint.h>
6161

62-
/* Internal type, do not use. */
63-
struct uv__queue {
64-
struct uv__queue* next;
65-
struct uv__queue* prev;
66-
};
67-
6862
#if defined(_WIN32)
6963
# include "uv/win.h"
7064
#else
@@ -156,7 +150,6 @@ struct uv__queue {
156150
XX(EILSEQ, "illegal byte sequence") \
157151
XX(ESOCKTNOSUPPORT, "socket type not supported") \
158152
XX(ENODATA, "no data available") \
159-
XX(EUNATCH, "protocol driver not attached") \
160153

161154
#define UV_HANDLE_TYPE_MAP(XX) \
162155
XX(ASYNC, async) \
@@ -290,13 +283,13 @@ UV_EXTERN int uv_loop_init(uv_loop_t* loop);
290283
UV_EXTERN int uv_loop_close(uv_loop_t* loop);
291284
/*
292285
* NOTE:
293-
* This function is DEPRECATED, users should
286+
* This function is DEPRECATED (to be removed after 0.12), users should
294287
* allocate the loop manually and use uv_loop_init instead.
295288
*/
296289
UV_EXTERN uv_loop_t* uv_loop_new(void);
297290
/*
298291
* NOTE:
299-
* This function is DEPRECATED. Users should use
292+
* This function is DEPRECATED (to be removed after 0.12). Users should use
300293
* uv_loop_close and free the memory manually instead.
301294
*/
302295
UV_EXTERN void uv_loop_delete(uv_loop_t*);
@@ -466,7 +459,7 @@ struct uv_shutdown_s {
466459
uv_handle_type type; \
467460
/* private */ \
468461
uv_close_cb close_cb; \
469-
struct uv__queue handle_queue; \
462+
void* handle_queue[2]; \
470463
union { \
471464
int fd; \
472465
void* reserved[4]; \
@@ -808,10 +801,6 @@ inline int uv_tty_set_mode(uv_tty_t* handle, int mode) {
808801

809802
UV_EXTERN uv_handle_type uv_guess_handle(uv_file file);
810803

811-
enum {
812-
UV_PIPE_NO_TRUNCATE = 1u << 0
813-
};
814-
815804
/*
816805
* uv_pipe_t is a subclass of uv_stream_t.
817806
*
@@ -828,20 +817,10 @@ struct uv_pipe_s {
828817
UV_EXTERN int uv_pipe_init(uv_loop_t*, uv_pipe_t* handle, int ipc);
829818
UV_EXTERN int uv_pipe_open(uv_pipe_t*, uv_file file);
830819
UV_EXTERN int uv_pipe_bind(uv_pipe_t* handle, const char* name);
831-
UV_EXTERN int uv_pipe_bind2(uv_pipe_t* handle,
832-
const char* name,
833-
size_t namelen,
834-
unsigned int flags);
835820
UV_EXTERN void uv_pipe_connect(uv_connect_t* req,
836821
uv_pipe_t* handle,
837822
const char* name,
838823
uv_connect_cb cb);
839-
UV_EXTERN int uv_pipe_connect2(uv_connect_t* req,
840-
uv_pipe_t* handle,
841-
const char* name,
842-
size_t namelen,
843-
unsigned int flags,
844-
uv_connect_cb cb);
845824
UV_EXTERN int uv_pipe_getsockname(const uv_pipe_t* handle,
846825
char* buffer,
847826
size_t* size);
@@ -1870,7 +1849,7 @@ struct uv_loop_s {
18701849
void* data;
18711850
/* Loop reference counting. */
18721851
unsigned int active_handles;
1873-
struct uv__queue handle_queue;
1852+
void* handle_queue[2];
18741853
union {
18751854
void* unused;
18761855
unsigned int count;

‎deps/uv/include/uv/darwin.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
void* cf_state; \
4141
uv_mutex_t cf_mutex; \
4242
uv_sem_t cf_sem; \
43-
struct uv__queue cf_signals; \
43+
void* cf_signals[2]; \
4444

4545
#define UV_PLATFORM_FS_EVENT_FIELDS \
4646
uv__io_t event_watcher; \
4747
char* realpath; \
4848
int realpath_len; \
4949
int cf_flags; \
5050
uv_async_t* cf_cb; \
51-
struct uv__queue cf_events; \
52-
struct uv__queue cf_member; \
51+
void* cf_events[2]; \
52+
void* cf_member[2]; \
5353
int cf_error; \
5454
uv_mutex_t cf_mutex; \
5555

‎deps/uv/include/uv/errno.h

-6
Original file line numberDiff line numberDiff line change
@@ -468,10 +468,4 @@
468468
# define UV__ENODATA (-4024)
469469
#endif
470470

471-
#if defined(EUNATCH) && !defined(_WIN32)
472-
# define UV__EUNATCH UV__ERR(EUNATCH)
473-
#else
474-
# define UV__EUNATCH (-4023)
475-
#endif
476-
477471
#endif /* UV_ERRNO_H_ */

‎deps/uv/include/uv/linux.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
int inotify_fd; \
2929

3030
#define UV_PLATFORM_FS_EVENT_FIELDS \
31-
struct uv__queue watchers; \
31+
void* watchers[2]; \
3232
int wd; \
3333

3434
#endif /* UV_LINUX_H */

‎deps/uv/include/uv/threadpool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct uv__work {
3131
void (*work)(struct uv__work *w);
3232
void (*done)(struct uv__work *w, int status);
3333
struct uv_loop_s* loop;
34-
struct uv__queue wq;
34+
void* wq[2];
3535
};
3636

3737
#endif /* UV_THREADPOOL_H_ */

0 commit comments

Comments
 (0)