Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump libuv to 1.35.0 #471

Merged
merged 2 commits into from
Mar 31, 2020
Merged

Bump libuv to 1.35.0 #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e31cac
Bump libuv to 1.35.0
squeek502 Mar 30, 2020
258b3de
Add support for UV_UDP_MMSG_CHUNK
squeek502 Mar 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ endif()
project (luv C ASM)

set(LUV_VERSION_MAJOR 1)
set(LUV_VERSION_MINOR 34)
set(LUV_VERSION_PATCH 2)
set(LUV_VERSION_MINOR 35)
set(LUV_VERSION_PATCH 0)
set(LUV_VERSION ${LUV_VERSION_MAJOR}.${LUV_VERSION_MINOR}.${LUV_VERSION_PATCH})

option(BUILD_MODULE "Build as module" ON)
Expand Down
2 changes: 1 addition & 1 deletion deps/libuv
Open in desktop
Submodule libuv updated 59 files
+5 −0 AUTHORS
+245 −183 CMakeLists.txt
+2 −2 CONTRIBUTING.md
+102 −1 ChangeLog
+2 −0 MAINTAINERS.md
+1 −0 Makefile.am
+7 −0 README.md
+1 −1 configure.ac
+9 −0 docs/src/misc.rst
+5 −1 docs/src/pipe.rst
+ − docs/src/static/diagrams.key/Data/st0-311.jpg
+ − docs/src/static/diagrams.key/Data/st1-475.jpg
+5 −0 docs/src/tcp.rst
+10 −3 docs/src/udp.rst
+7 −1 include/uv.h
+2 −2 include/uv/version.h
+1 −1 include/uv/win.h
+1 −1 src/timer.c
+13 −71 src/unix/async.c
+52 −91 src/unix/core.c
+25 −0 src/unix/freebsd.c
+1 −16 src/unix/ibmi.c
+27 −4 src/unix/internal.h
+20 −47 src/unix/linux-inotify.c
+1 −190 src/unix/linux-syscalls.c
+0 −79 src/unix/linux-syscalls.h
+4 −6 src/unix/openbsd.c
+20 −11 src/unix/os390-syscalls.c
+5 −1 src/unix/pipe.c
+35 −43 src/unix/process.c
+42 −23 src/unix/proctitle.c
+1 −22 src/unix/signal.c
+10 −2 src/unix/tcp.c
+207 −9 src/unix/udp.c
+80 −71 src/win/pipe.c
+12 −11 src/win/tcp.c
+220 −117 src/win/tty.c
+1 −0 test/benchmark-list.h
+6 −2 test/benchmark-multi-accept.c
+163 −0 test/benchmark-ping-udp.c
+40 −15 test/echo-server.c
+11 −0 test/run-tests.c
+18 −1 test/runner.c
+3 −0 test/test-fs-copyfile.c
+9 −1 test/test-fs-event.c
+11 −0 test/test-fs.c
+5 −6 test/test-get-memory.c
+2 −0 test/test-get-passwd.c
+38 −2 test/test-list.h
+27 −10 test/test-poll.c
+59 −0 test/test-process-title.c
+26 −1 test/test-signal-pending-on-close.c
+19 −3 test/test-spawn.c
+89 −46 test/test-stdio-over-pipes.c
+1,621 −0 test/test-tty-escape-sequence-processing.c
+4 −0 test/test-udp-connect.c
+55 −4 test/test-udp-ipv6.c
+2 −1 test/test-watcher-cross-stop.c
+2 −0 test/test.gyp
14 changes: 14 additions & 0 deletions src/udp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,15 @@ static void luv_udp_recv_cb(uv_udp_t* handle, ssize_t nread, const uv_buf_t* buf
else {
lua_pushnil(L);
}
#if LUV_UV_VERSION_GEQ(1, 35, 0)
// UV_UDP_MMSG_CHUNK Indicates that the message was received by recvmmsg, so the buffer provided
// must not be freed by the recv_cb callback.
if (buf && !(flags & UV_UDP_MMSG_CHUNK)) {
free(buf->base);
}
#else
if (buf) free(buf->base);
#endif

// address
if (addr) {
Expand All @@ -297,6 +305,12 @@ static void luv_udp_recv_cb(uv_udp_t* handle, ssize_t nread, const uv_buf_t* buf
lua_pushboolean(L, 1);
lua_setfield(L, -2, "partial");
}
#if LUV_UV_VERSION_GEQ(1, 35, 0)
if (flags & UV_UDP_MMSG_CHUNK) {
lua_pushboolean(L, 1);
lua_setfield(L, -2, "mmsg_chunk");
}
#endif

luv_call_callback(L, (luv_handle_t*)handle->data, LUV_RECV, 4);
}
Expand Down