Skip to content

Commit cbb3d8c

Browse files
authored
deps: update libuv to 1.51.0
nodejs/node#58124
1 parent da0ab2a commit cbb3d8c

4 files changed

Lines changed: 23 additions & 63 deletions

patches/node/.patches

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ test_use_static_method_names_in_call_stacks.patch
3737
build_use_third_party_simdutf.patch
3838
fix_remove_fastapitypedarray_usage.patch
3939
test_handle_explicit_resource_management_globals.patch
40-
linux_try_preadv64_pwritev64_before_preadv_pwritev_4683.patch
4140
build_change_crdtp_protocoltypetraits_signatures_to_avoid_conflict.patch
4241
build_option_to_use_custom_inspector_protocol_path.patch
4342
fix_adjust_wpt_and_webidl_tests_for_enabled_float16array.patch

patches/node/feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ diff --git a/deps/uv/src/unix/async.c b/deps/uv/src/unix/async.c
3838
index 0ff2669e30a628dbb2df9e28ba14b38cf14114e5..117190ef26338944b78dbed7380c631de8057223 100644
3939
--- a/deps/uv/src/unix/async.c
4040
+++ b/deps/uv/src/unix/async.c
41-
@@ -38,7 +38,6 @@
42-
#include <sys/eventfd.h>
41+
@@ -66,7 +66,6 @@ static void uv__kqueue_runtime_detection(void) {
42+
}
4343
#endif
4444

4545
-static void uv__async_send(uv_loop_t* loop);
4646
static int uv__async_start(uv_loop_t* loop);
4747
static void uv__cpu_relax(void);
4848

49-
@@ -78,7 +77,7 @@ int uv_async_send(uv_async_t* handle) {
49+
@@ -106,7 +105,7 @@ int uv_async_send(uv_async_t* handle) {
5050

5151
/* Wake up the other thread's event loop. */
5252
if (atomic_exchange(pending, 1) == 0)
@@ -55,7 +55,7 @@ index 0ff2669e30a628dbb2df9e28ba14b38cf14114e5..117190ef26338944b78dbed7380c631d
5555

5656
/* Set the loop to not-busy. */
5757
atomic_fetch_add(busy, -1);
58-
@@ -178,39 +177,6 @@ static void uv__async_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
58+
@@ -210,50 +209,6 @@ static void uv__async_io(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
5959
}
6060

6161

@@ -76,6 +76,17 @@ index 0ff2669e30a628dbb2df9e28ba14b38cf14114e5..117190ef26338944b78dbed7380c631d
7676
- len = sizeof(val);
7777
- fd = loop->async_io_watcher.fd; /* eventfd */
7878
- }
79+
-#elif UV__KQUEUE_EVFILT_USER
80+
- struct kevent ev;
81+
-
82+
- if (kqueue_evfilt_user_support) {
83+
- fd = loop->async_io_watcher.fd; /* magic number for EVFILT_USER */
84+
- EV_SET(&ev, fd, EVFILT_USER, 0, NOTE_TRIGGER, 0, 0);
85+
- r = kevent(loop->backend_fd, &ev, 1, NULL, 0, NULL);
86+
- if (r == 0)
87+
- return;
88+
- abort();
89+
- }
7990
-#endif
8091
-
8192
- do
@@ -99,17 +110,17 @@ diff --git a/deps/uv/src/unix/core.c b/deps/uv/src/unix/core.c
99110
index 0c52ccf2ad7b2dcae77a7bc4b3af9d1a1346ce18..13cd33a7d3031c5e19c9418a18217d1e4158c82e 100644
100111
--- a/deps/uv/src/unix/core.c
101112
+++ b/deps/uv/src/unix/core.c
102-
@@ -937,6 +937,9 @@ void uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
103-
loop->watchers[w->fd] = w;
113+
@@ -944,6 +944,9 @@ int uv__io_start(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
104114
loop->nfds++;
105115
}
106-
+
116+
107117
+ if (uv__get_internal_fields(loop)->flags & UV_LOOP_INTERRUPT_ON_IO_CHANGE)
108118
+ uv__loop_interrupt(loop);
119+
+
120+
return 0;
109121
}
110122

111-
112-
@@ -968,6 +971,9 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
123+
@@ -993,6 +996,9 @@ void uv__io_stop(uv_loop_t* loop, uv__io_t* w, unsigned int events) {
113124
}
114125
else if (uv__queue_empty(&w->watcher_queue))
115126
uv__queue_insert_tail(&loop->watcher_queue, &w->watcher_queue);

patches/node/fix_remove_deprecated_errno_constants.patch

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,15 @@ diff --git a/deps/uv/include/uv.h b/deps/uv/include/uv.h
1313
index f75a496071ac3396cbc6dec819eaab7294609deb..30f9a05f2f508b55a7d7ae036612660068c8400e 100644
1414
--- a/deps/uv/include/uv.h
1515
+++ b/deps/uv/include/uv.h
16-
@@ -155,7 +155,6 @@ struct uv__queue {
16+
@@ -156,7 +156,6 @@ struct uv__queue {
1717
XX(EFTYPE, "inappropriate file type or format") \
1818
XX(EILSEQ, "illegal byte sequence") \
1919
XX(ESOCKTNOSUPPORT, "socket type not supported") \
2020
- XX(ENODATA, "no data available") \
2121
XX(EUNATCH, "protocol driver not attached") \
22+
XX(ENOEXEC, "exec format error") \
2223

23-
#define UV_HANDLE_TYPE_MAP(XX) \
24+
\
2425
diff --git a/deps/uv/include/uv/errno.h b/deps/uv/include/uv/errno.h
2526
index 127278ef916161a96e23e645927d16bedfdaca5b..b36da3daa5744e6f994e32d9d82aaef689008a5f 100644
2627
--- a/deps/uv/include/uv/errno.h

patches/node/linux_try_preadv64_pwritev64_before_preadv_pwritev_4683.patch

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)