deps: update libuv to 1.49.2

Fixes: #56137 Refs: #56223 PR-URL: #56224 Reviewed-By: Santiago Gimeno <[email protected]> Reviewed-By: Richard Lau <[email protected]>

Author: lpinca

deps/uv/AUTHORS

@@ -588,3 +588,5 @@ Raihaan Shouhell <[email protected]>
 Rialbat <[email protected]>
 Adam <[email protected]>
 Poul T Lomholt <[email protected]>
+dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
+Thad House <[email protected]>

deps/uv/ChangeLog

@@ -1,4 +1,22 @@
-2024.10.11, Version 1.49.1 (Stable)
+2024.10.18, Version 1.49.2 (Stable)
+
+Changes since version 1.49.1:
+
+* win,fs: remove trailing slash in junctions (Hüseyin Açacak)
+
+* Revert "linux: eliminate a read on eventfd per wakeup" (Ben Noordhuis)
+
+* win: Fix linked list logic in getaddrinfo (Thad House)
+
+* win: fix compilation against Windows 24H2 SDK (Thad House)
+
+* win: remap ERROR_NOACCESS and ERROR_BUFFER_OVERFLOW (Jameson Nash)
+
+* win,fs: match trailing slash presence in junctions to user input (Jameson
+ Nash)
+
+
+2024.10.11, Version 1.49.1 (Stable), 8be336f4ee296d20e1c071a44d6adf279e202236
 
 Changes since version 1.49.0:
 

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.49.1], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.49.2], [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])

deps/uv/include/uv/version.h

@@ -32,7 +32,7 @@
 
 #defineUV_VERSION_MAJOR 1
 #defineUV_VERSION_MINOR 49
-#defineUV_VERSION_PATCH1
+#defineUV_VERSION_PATCH2
 #defineUV_VERSION_IS_RELEASE 1
 #defineUV_VERSION_SUFFIX ""
 

deps/uv/src/unix/async.c

@@ -38,34 +38,6 @@
 #include<sys/eventfd.h>
 #endif
 
-#ifUV__KQUEUE_EVFILT_USER
-staticuv_once_tkqueue_runtime_detection_guard=UV_ONCE_INIT;
-staticintkqueue_evfilt_user_support=1;
-
-
-staticvoiduv__kqueue_runtime_detection(void){
-intkq;
-structkeventev[2];
-structtimespectimeout={0, 0};
-
-/* Perform the runtime detection to ensure that kqueue with
- * EVFILT_USER actually works. */
-kq=kqueue();
-EV_SET(ev, UV__KQUEUE_EVFILT_USER_IDENT, EVFILT_USER,
-EV_ADD | EV_CLEAR, 0, 0, 0);
-EV_SET(ev+1, UV__KQUEUE_EVFILT_USER_IDENT, EVFILT_USER,
-0, NOTE_TRIGGER, 0, 0);
-if (kevent(kq, ev, 2, ev, 1, &timeout) <1||
-ev[0].filter!=EVFILT_USER||
-ev[0].ident!=UV__KQUEUE_EVFILT_USER_IDENT||
-ev[0].flags&EV_ERROR)
-/* If we wind up here, we can assume that EVFILT_USER is defined but
- * broken on the current system. */
-kqueue_evfilt_user_support=0;
-uv__close(kq);
-}
-#endif
-
 staticvoiduv__async_send(uv_loop_t*loop);
 staticintuv__async_start(uv_loop_t*loop);
 staticvoiduv__cpu_relax(void);
@@ -158,23 +130,16 @@ void uv__async_close(uv_async_t* handle){
 
 
 staticvoiduv__async_io(uv_loop_t*loop, uv__io_t*w, unsigned intevents){
-#ifndef__linux__
 charbuf[1024];
 ssize_tr;
-#endif
 structuv__queuequeue;
 structuv__queue*q;
 uv_async_t*h;
  _Atomic int*pending;
 
 assert(w==&loop->async_io_watcher);
 
-#ifndef__linux__
-#ifUV__KQUEUE_EVFILT_USER
-for (;!kqueue_evfilt_user_support;){
-#else
 for (;){
-#endif
 r=read(w->fd, buf, sizeof(buf));
 
 if (r==sizeof(buf))
@@ -191,7 +156,6 @@ static void uv__async_io(uv_loop_t* loop, uv__io_t* w, unsigned int events){
 
 abort();
  }
-#endif/* !__linux__ */
 
 uv__queue_move(&loop->async_handles, &queue);
 while (!uv__queue_empty(&queue)){
@@ -215,58 +179,34 @@ static void uv__async_io(uv_loop_t* loop, uv__io_t* w, unsigned int events){
 
 
 staticvoiduv__async_send(uv_loop_t*loop){
+constvoid*buf;
+ssize_tlen;
 intfd;
-ssize_tr;
-#ifdef__linux__
-uint64_tval;
-
-fd=loop->async_io_watcher.fd; /* eventfd */
-for (val=1; /* empty */; val=1){
-r=write(fd, &val, sizeof(uint64_t));
-if (r<0){
-/* When EAGAIN occurs, the eventfd counter hits the maximum value of the unsigned 64-bit.
- * We need to first drain the eventfd and then write again.
- *
- * Check out https://man7.org/linux/man-pages/man2/eventfd.2.html for details.
- */
-if (errno==EAGAIN){
-/* It's ready to retry. */
-if (read(fd, &val, sizeof(uint64_t)) >0||errno==EAGAIN){
-continue;
- }
- }
-/* Unknown error occurs. */
-break;
- }
-return;
- }
-#else
-#ifUV__KQUEUE_EVFILT_USER
-structkeventev;
-
-if (kqueue_evfilt_user_support){
-fd=loop->async_io_watcher.fd; /* magic number for EVFILT_USER */
-EV_SET(&ev, fd, EVFILT_USER, 0, NOTE_TRIGGER, 0, 0);
-r=kevent(loop->backend_fd, &ev, 1, NULL, 0, NULL);
-if (r==0)
-return;
-else
-abort();
+intr;
+
+buf="";
+len=1;
+fd=loop->async_wfd;
+
+#if defined(__linux__)
+if (fd==-1){
+staticconstuint64_tval=1;
+buf=&val;
+len=sizeof(val);
+fd=loop->async_io_watcher.fd; /* eventfd */
  }
 #endif
 
-fd=loop->async_wfd; /* write end of the pipe */
 do
-r=write(fd, "x", 1);
+r=write(fd, buf, len);
 while (r==-1&&errno==EINTR);
 
-if (r==1)
+if (r==len)
 return;
 
 if (r==-1)
 if (errno==EAGAIN||errno==EWOULDBLOCK)
 return;
-#endif
 
 abort();
 }
@@ -275,9 +215,6 @@ static void uv__async_send(uv_loop_t* loop){
 staticintuv__async_start(uv_loop_t*loop){
 intpipefd[2];
 interr;
-#ifUV__KQUEUE_EVFILT_USER
-structkeventev;
-#endif
 
 if (loop->async_io_watcher.fd!=-1)
 return0;
@@ -289,36 +226,6 @@ static int uv__async_start(uv_loop_t* loop){
 
 pipefd[0] =err;
 pipefd[1] =-1;
-#elifUV__KQUEUE_EVFILT_USER
-uv_once(&kqueue_runtime_detection_guard, uv__kqueue_runtime_detection);
-if (kqueue_evfilt_user_support){
-/* In order not to break the generic pattern of I/O polling, a valid
- * file descriptor is required to take up a room in loop->watchers,
- * thus we create one for that, but this fd will not be actually used,
- * it's just a placeholder and magic number which is going to be closed
- * during the cleanup, as other FDs. */
-err=uv__open_cloexec("/dev/null", O_RDONLY);
-if (err<0)
-returnerr;
-
-pipefd[0] =err;
-pipefd[1] =-1;
-
-/* When using EVFILT_USER event to wake up the kqueue, this event must be
- * registered beforehand. Otherwise, calling kevent() to issue an
- * unregistered EVFILT_USER event will get an ENOENT.
- * Since uv__async_send() may happen before uv__io_poll() with multi-threads,
- * we can't defer this registration of EVFILT_USER event as we did for other
- * events, but must perform it right away. */
-EV_SET(&ev, err, EVFILT_USER, EV_ADD | EV_CLEAR, 0, 0, 0);
-err=kevent(loop->backend_fd, &ev, 1, NULL, 0, NULL);
-if (err<0)
-returnUV__ERR(errno);
- } else{
-err=uv__make_pipe(pipefd, UV_NONBLOCK_PIPE);
-if (err<0)
-returnerr;
- }
 #else
 err=uv__make_pipe(pipefd, UV_NONBLOCK_PIPE);
 if (err<0)
@@ -329,13 +236,6 @@ static int uv__async_start(uv_loop_t* loop){
 uv__io_start(loop, &loop->async_io_watcher, POLLIN);
 loop->async_wfd=pipefd[1];
 
-#ifUV__KQUEUE_EVFILT_USER
-/* Prevent the EVFILT_USER event from being added to kqueue redundantly
- * and mistakenly later in uv__io_poll(). */
-if (kqueue_evfilt_user_support)
-loop->async_io_watcher.events=loop->async_io_watcher.pevents; 
-#endif
-
 return0;
 }
 

deps/uv/src/unix/internal.h

@@ -35,10 +35,6 @@
 #include<sys/socket.h>
 #include<sys/stat.h>
 #include<sys/types.h>
-#if defined(__APPLE__) || defined(__DragonFly__) || \
- defined(__FreeBSD__) || defined(__NetBSD__)
-#include<sys/event.h>
-#endif
 
 #defineuv__msan_unpoison(p, n) \
  do{\
@@ -508,22 +504,4 @@ int uv__get_constrained_cpu(uv__cpu_constraint* constraint);
 #endif
 #endif
 
-#if defined(EVFILT_USER) && defined(NOTE_TRIGGER)
-/* EVFILT_USER is available since OS X 10.6, DragonFlyBSD 4.0,
- * FreeBSD 8.1, and NetBSD 10.0.
- * 
- * Note that even though EVFILT_USER is defined on the current system,
- * it may still fail to work at runtime somehow. In that case, we fall
- * back to pipe-based signaling.
- */
-#defineUV__KQUEUE_EVFILT_USER 1
-/* Magic number of identifier used for EVFILT_USER during runtime detection.
- * There are no Google hits for this number when I create it. That way,
- * people will be directed here if this number gets printed due to some
- * kqueue error and they google for help. */
-#defineUV__KQUEUE_EVFILT_USER_IDENT 0x1e7e7711
-#else
-#defineUV__KQUEUE_EVFILT_USER 0
-#endif
-
 #endif/* UV_UNIX_INTERNAL_H_ */

deps/uv/src/unix/kqueue.c

@@ -367,17 +367,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout){
 continue;
  }
 
-#ifUV__KQUEUE_EVFILT_USER
-if (ev->filter==EVFILT_USER){
-w=&loop->async_io_watcher;
-assert(fd==w->fd);
-uv__metrics_update_idle_time(loop);
-w->cb(loop, w, w->events);
-nevents++;
-continue;
- }
-#endif
-
 if (ev->filter==EVFILT_VNODE){
 assert(w->events==POLLIN);
 assert(w->pevents==POLLIN);

deps/uv/src/unix/linux.c

@@ -1414,12 +1414,6 @@ void uv__io_poll(uv_loop_t* loop, int timeout){
 
 w->events=w->pevents;
 e.events=w->pevents;
-if (w==&loop->async_io_watcher)
-/* Enable edge-triggered mode on async_io_watcher(eventfd),
- * so that we're able to eliminate the overhead of reading
- * the eventfd via system call on each event loop wakeup.
- */
-e.events |= EPOLLET;
 e.data.fd=w->fd;
 fd=w->fd;
 

deps/uv/src/win/error.c

@@ -69,7 +69,6 @@ int uv_translate_sys_error(int sys_errno){
  }
 
 switch (sys_errno){
-caseERROR_NOACCESS: returnUV_EACCES;
 caseWSAEACCES: returnUV_EACCES;
 caseERROR_ELEVATION_REQUIRED: returnUV_EACCES;
 caseERROR_CANT_ACCESS_FILE: returnUV_EACCES;
@@ -96,7 +95,7 @@ int uv_translate_sys_error(int sys_errno){
 caseWSAECONNRESET: returnUV_ECONNRESET;
 caseERROR_ALREADY_EXISTS: returnUV_EEXIST;
 caseERROR_FILE_EXISTS: returnUV_EEXIST;
-caseERROR_BUFFER_OVERFLOW:returnUV_EFAULT;
+caseERROR_NOACCESS: returnUV_EFAULT;
 caseWSAEFAULT: returnUV_EFAULT;
 caseERROR_HOST_UNREACHABLE: returnUV_EHOSTUNREACH;
 caseWSAEHOSTUNREACH: returnUV_EHOSTUNREACH;
@@ -127,6 +126,7 @@ int uv_translate_sys_error(int sys_errno){
 caseERROR_TOO_MANY_OPEN_FILES: returnUV_EMFILE;
 caseWSAEMFILE: returnUV_EMFILE;
 caseWSAEMSGSIZE: returnUV_EMSGSIZE;
+caseERROR_BUFFER_OVERFLOW: returnUV_ENAMETOOLONG;
 caseERROR_FILENAME_EXCED_RANGE: returnUV_ENAMETOOLONG;
 caseERROR_NETWORK_UNREACHABLE: returnUV_ENETUNREACH;
 caseWSAENETUNREACH: returnUV_ENETUNREACH;

deps/uv/src/win/fs.c

@@ -2566,16 +2566,17 @@ static void fs__create_junction(uv_fs_t* req, const WCHAR* path,
 
 path_buf[path_buf_len++] =path[i];
  }
-path_buf[path_buf_len++] =L'\\';
+if (add_slash)
+path_buf[path_buf_len++] =L'\\';
 len=path_buf_len-start;
 
+/* Insert null terminator */
+path_buf[path_buf_len++] =L'\0';
+
 /* Set the info about the substitute name */
 buffer->MountPointReparseBuffer.SubstituteNameOffset=start*sizeof(WCHAR);
 buffer->MountPointReparseBuffer.SubstituteNameLength=len*sizeof(WCHAR);
 
-/* Insert null terminator */
-path_buf[path_buf_len++] =L'\0';
-
 /* Copy the print name of the target path */
 start=path_buf_len;
 add_slash=0;
@@ -2593,18 +2594,18 @@ static void fs__create_junction(uv_fs_t* req, const WCHAR* path,
 path_buf[path_buf_len++] =path[i];
  }
 len=path_buf_len-start;
-if (len==2){
+if (len==2||add_slash){
 path_buf[path_buf_len++] =L'\\';
 len++;
  }
 
+/* Insert another null terminator */
+path_buf[path_buf_len++] =L'\0';
+
 /* Set the info about the print name */
 buffer->MountPointReparseBuffer.PrintNameOffset=start*sizeof(WCHAR);
 buffer->MountPointReparseBuffer.PrintNameLength=len*sizeof(WCHAR);
 
-/* Insert another null terminator */
-path_buf[path_buf_len++] =L'\0';
-
 /* Calculate how much buffer space was actually used */
 used_buf_size=FIELD_OFFSET(REPARSE_DATA_BUFFER, MountPointReparseBuffer.PathBuffer) +
 path_buf_len*sizeof(WCHAR);