Changes since version 1.19.1: * test: fix incorrect asserts (cjihrig) * test: fix a typo in test-fork.c (Felix Yan) * build: remove long-obsolete gyp workarounds (Ben Noordhuis) * build: split off tests into separate gyp file (Ben Noordhuis) * test: check uv_cond_timedwait more carefully (Jamie Davis) * include,src: introduce UV__ERR() macro (Mason X) * build: add url field to libuv.pc (Ben Noordhuis) * doc: mark IBM i as Tier 3 support (Jesse Gorzinski) * win,build: correct C2059 errors (Michael Fero) * zos: fix timeout for condition variable (jBarz) * win: CREATE_NO_WINDOW when stdio is not inherited (Nick Logan) * build: fix commmon.gypi comment (Ryuichi KAWAMATA) * doc: document uv_timer_start() on an active timer (Vladimír Čunát) * doc: add note about handle movability (Bartosz Sosnowski) * doc: fix syntax error in loop documentation (Bartosz Sosnowski) * osx,stream: retry sending handle on EMSGSIZE error (Santiago Gimeno) * unix: delay fs req register until after validation (cjihrig) * test: add tests for bad inputs (Joyee Cheung) * unix,win: ensure req->bufs is freed (cjihrig) * test: add additional fs memory management checks (cjihrig) -----BEGIN PGP SIGNATURE----- Comment: GPGTools - https://gpgtools.org iQIcBAABCgAGBQJajdXDAAoJEHQ0OQvb6bnF+gkQAIYnk1ujKETakcu/O8M/d+yu gZkLAnqkMYD5X5rTEFkaHrzrQMD85twxme+GgegSFweUDvhqVQWveeNG5zRJ8/ri HsysKioqBsMfzCtJw4W+wDLIL7ltja2vcZooTTyvrIArLd2zQ8sn0nHe/eTq2uKl wMPhup9qxl10THpevdab3AMr1jEJ3KSsFaNUaVLySf6DJJqY4pRV+ekDGQVrkNZU XzH67YN2XWP5dsavAVX0GsnQraX8kNWgYjcDK93D55hj93iyq+38ZYstEhNqIGF9 9StzptoUyqK5KD5tyDYC2WmgwBJd9eAodmjCdq+ZP0td/irxEhQoRAX7aoAjBGzY j3vTb0JXhvvEghivap86mkxPhAQ6rmbGZkG/yOi6eexL/es1GwhGmfzE3NgUexCx nyKVCWqVo4IjL53+jndaX3wE4AIKpo0geah7f82v7cIJJqYN8DtaNN9imwZO3r7p WFUx2ujOYGuFcz1xbFNyLzBH0Rda2JnsvtAstGvWXSoXzCNSEU5PZ6rpn3jcOVU5 mDjQ9z/x3kp25qp014+wxHD+mltZzcL8H8fJfQ9JkGWdYE+R3brzwib07GctdlKP 3/PGH6vbDyiiCEiwfwjhjZpZWyJcaEuGegEc7J80uEm+/yq1/4HrdaFbI20D2heB NIj8XaaPt8Vqsafp0ZWp =Aa+M -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEYS8OrZQBYiN530QC8ow8jaM8A74FAlqRjUEACgkQ8ow8jaM8 A77UBw//b71/tAhf1ZOEwouhCjuoy17PNrgfmpQFw8NbaJc6YALe2oQ+1+gc/GPp 9kaPfjDLSlZwYJMVtiTmKaQoqYNj3Y6ZJatZYambZ89/3XCBjd4WbK2IMnpth+xU tLzvjd5RlNMNpyrdrlEXneZi5ql7/QeRLj85k2790LSSajODK8A4VoZZoRmfBL4S rnngc5BFI2MGNOyUcc4HBtAcusvt6KIZWxhiRHLa0vpNmrnUAcXqruxzp36+ct+3 efy+9cx6uzbnqg7dv8WHljre+2we4NaHcH4W2zCkNuf0JrO9reJMjojBb3+NsVIt HBHonkVLvRf8eTv8VFoKQPqeMStVj2FtVRmuKqcZ8l/fZNH/Fz2R2tO2ZaLCrSax TkAiuLi7uOY32oBNNyI6GGwcJAD52ROl+UCBEoRCOpYVx6PWjZnun7zP7bYq+oJt h1qL7avrGfp7vG+ggDxfeEOlWZKeXBN6/uh+KnTFryxMwZ9GFNu46s2EttS2lATg eKvPXTPBF9xKVCxckDph5sBhT420SBt2xa8neeMMdEKXPaDPtyj9kMau6HeU84cO bcnGytFhlhx7qUv1sEO0gHp/fYkvdUYUhzsY5lWeVdz3U3j/YhQO+ErzBzhIOU+E arC+ldYO9eWzdgRxodOcHX6YFAEnHFeyXs5KfOKbUNdqD0dLNJQ= =lWVS -----END PGP SIGNATURE----- Merge tag 'v1.19.2' into merge_1.19.2 PR-URL: https://github.com/libuv/libuv/pull/1753 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
430 lines
10 KiB
C
430 lines
10 KiB
C
/* Copyright Joyent, Inc. and other Node contributors. All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to
|
|
* deal in the Software without restriction, including without limitation the
|
|
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
|
* sell copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include "uv.h"
|
|
#include "task.h"
|
|
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
/* See test-ipc.ctx */
|
|
void spawn_helper(uv_pipe_t* channel,
|
|
uv_process_t* process,
|
|
const char* helper);
|
|
|
|
void ipc_send_recv_helper_threadproc(void* arg);
|
|
|
|
union handles {
|
|
uv_handle_t handle;
|
|
uv_stream_t stream;
|
|
uv_pipe_t pipe;
|
|
uv_tcp_t tcp;
|
|
uv_tty_t tty;
|
|
};
|
|
|
|
struct test_ctx {
|
|
uv_pipe_t channel;
|
|
uv_connect_t connect_req;
|
|
uv_write_t write_req;
|
|
uv_write_t write_req2;
|
|
uv_handle_type expected_type;
|
|
union handles send;
|
|
union handles send2;
|
|
union handles recv;
|
|
union handles recv2;
|
|
};
|
|
|
|
struct echo_ctx {
|
|
uv_pipe_t listen;
|
|
uv_pipe_t channel;
|
|
uv_write_t write_req;
|
|
uv_write_t write_req2;
|
|
uv_handle_type expected_type;
|
|
union handles recv;
|
|
union handles recv2;
|
|
};
|
|
|
|
static struct test_ctx ctx;
|
|
static struct echo_ctx ctx2;
|
|
|
|
/* Used in write2_cb to decide if we need to cleanup or not */
|
|
static int is_child_process;
|
|
static int is_in_process;
|
|
static int read_cb_count;
|
|
static int recv_cb_count;
|
|
static int write2_cb_called;
|
|
|
|
|
|
static void alloc_cb(uv_handle_t* handle,
|
|
size_t suggested_size,
|
|
uv_buf_t* buf) {
|
|
/* we're not actually reading anything so a small buffer is okay */
|
|
static char slab[8];
|
|
buf->base = slab;
|
|
buf->len = sizeof(slab);
|
|
}
|
|
|
|
|
|
static void recv_cb(uv_stream_t* handle,
|
|
ssize_t nread,
|
|
const uv_buf_t* buf) {
|
|
uv_handle_type pending;
|
|
uv_pipe_t* pipe;
|
|
int r;
|
|
union handles* recv;
|
|
|
|
pipe = (uv_pipe_t*) handle;
|
|
ASSERT(pipe == &ctx.channel);
|
|
|
|
do {
|
|
if (++recv_cb_count == 1) {
|
|
recv = &ctx.recv;
|
|
} else {
|
|
recv = &ctx.recv2;
|
|
}
|
|
|
|
/* Depending on the OS, the final recv_cb can be called after
|
|
* the child process has terminated which can result in nread
|
|
* being UV_EOF instead of the number of bytes read. Since
|
|
* the other end of the pipe has closed this UV_EOF is an
|
|
* acceptable value. */
|
|
if (nread == UV_EOF) {
|
|
/* UV_EOF is only acceptable for the final recv_cb call */
|
|
ASSERT(recv_cb_count == 2);
|
|
} else {
|
|
ASSERT(nread >= 0);
|
|
ASSERT(uv_pipe_pending_count(pipe) > 0);
|
|
|
|
pending = uv_pipe_pending_type(pipe);
|
|
ASSERT(pending == ctx.expected_type);
|
|
|
|
if (pending == UV_NAMED_PIPE)
|
|
r = uv_pipe_init(ctx.channel.loop, &recv->pipe, 0);
|
|
else if (pending == UV_TCP)
|
|
r = uv_tcp_init(ctx.channel.loop, &recv->tcp);
|
|
else
|
|
abort();
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_accept(handle, &recv->stream);
|
|
ASSERT(r == 0);
|
|
}
|
|
} while (uv_pipe_pending_count(pipe) > 0);
|
|
|
|
/* Close after two writes received */
|
|
if (recv_cb_count == 2) {
|
|
uv_close((uv_handle_t*)&ctx.channel, NULL);
|
|
}
|
|
}
|
|
|
|
static void connect_cb(uv_connect_t* req, int status) {
|
|
int r;
|
|
uv_buf_t buf;
|
|
|
|
ASSERT(req == &ctx.connect_req);
|
|
ASSERT(status == 0);
|
|
|
|
buf = uv_buf_init(".", 1);
|
|
r = uv_write2(&ctx.write_req,
|
|
(uv_stream_t*)&ctx.channel,
|
|
&buf, 1,
|
|
&ctx.send.stream,
|
|
NULL);
|
|
ASSERT(r == 0);
|
|
|
|
/* Perform two writes to the same pipe to make sure that on Windows we are
|
|
* not running into issue 505:
|
|
* https://github.com/libuv/libuv/issues/505 */
|
|
buf = uv_buf_init(".", 1);
|
|
r = uv_write2(&ctx.write_req2,
|
|
(uv_stream_t*)&ctx.channel,
|
|
&buf, 1,
|
|
&ctx.send2.stream,
|
|
NULL);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_read_start((uv_stream_t*)&ctx.channel, alloc_cb, recv_cb);
|
|
ASSERT(r == 0);
|
|
}
|
|
|
|
static int run_test(int inprocess) {
|
|
uv_process_t process;
|
|
uv_thread_t tid;
|
|
int r;
|
|
|
|
if (inprocess) {
|
|
r = uv_thread_create(&tid, ipc_send_recv_helper_threadproc, (void *) 42);
|
|
ASSERT(r == 0);
|
|
|
|
uv_sleep(1000);
|
|
|
|
r = uv_pipe_init(uv_default_loop(), &ctx.channel, 1);
|
|
ASSERT(r == 0);
|
|
|
|
uv_pipe_connect(&ctx.connect_req, &ctx.channel, TEST_PIPENAME_3, connect_cb);
|
|
} else {
|
|
spawn_helper(&ctx.channel, &process, "ipc_send_recv_helper");
|
|
|
|
connect_cb(&ctx.connect_req, 0);
|
|
}
|
|
|
|
r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
|
|
ASSERT(r == 0);
|
|
|
|
ASSERT(recv_cb_count == 2);
|
|
|
|
if (inprocess) {
|
|
r = uv_thread_join(&tid);
|
|
ASSERT(r == 0);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int run_ipc_send_recv_pipe(int inprocess) {
|
|
int r;
|
|
|
|
ctx.expected_type = UV_NAMED_PIPE;
|
|
|
|
r = uv_pipe_init(uv_default_loop(), &ctx.send.pipe, 1);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_pipe_bind(&ctx.send.pipe, TEST_PIPENAME);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_pipe_init(uv_default_loop(), &ctx.send2.pipe, 1);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_pipe_bind(&ctx.send2.pipe, TEST_PIPENAME_2);
|
|
ASSERT(r == 0);
|
|
|
|
r = run_test(inprocess);
|
|
ASSERT(r == 0);
|
|
|
|
MAKE_VALGRIND_HAPPY();
|
|
return 0;
|
|
}
|
|
|
|
TEST_IMPL(ipc_send_recv_pipe) {
|
|
#if defined(NO_SEND_HANDLE_ON_PIPE)
|
|
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
|
|
#endif
|
|
return run_ipc_send_recv_pipe(0);
|
|
}
|
|
|
|
TEST_IMPL(ipc_send_recv_pipe_inprocess) {
|
|
#if defined(NO_SEND_HANDLE_ON_PIPE)
|
|
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
|
|
#endif
|
|
return run_ipc_send_recv_pipe(1);
|
|
}
|
|
|
|
static int run_ipc_send_recv_tcp(int inprocess) {
|
|
struct sockaddr_in addr;
|
|
int r;
|
|
|
|
ASSERT(0 == uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
|
|
|
|
ctx.expected_type = UV_TCP;
|
|
|
|
r = uv_tcp_init(uv_default_loop(), &ctx.send.tcp);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_tcp_init(uv_default_loop(), &ctx.send2.tcp);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_tcp_bind(&ctx.send.tcp, (const struct sockaddr*) &addr, 0);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_tcp_bind(&ctx.send2.tcp, (const struct sockaddr*) &addr, 0);
|
|
ASSERT(r == 0);
|
|
|
|
r = run_test(inprocess);
|
|
ASSERT(r == 0);
|
|
|
|
MAKE_VALGRIND_HAPPY();
|
|
return 0;
|
|
}
|
|
|
|
TEST_IMPL(ipc_send_recv_tcp) {
|
|
#if defined(NO_SEND_HANDLE_ON_PIPE)
|
|
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
|
|
#endif
|
|
return run_ipc_send_recv_tcp(0);
|
|
}
|
|
|
|
TEST_IMPL(ipc_send_recv_tcp_inprocess) {
|
|
#if defined(NO_SEND_HANDLE_ON_PIPE)
|
|
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
|
|
#endif
|
|
return run_ipc_send_recv_tcp(1);
|
|
}
|
|
|
|
|
|
/* Everything here runs in a child process or second thread. */
|
|
|
|
static void write2_cb(uv_write_t* req, int status) {
|
|
ASSERT(status == 0);
|
|
|
|
/* After two successful writes in the child process, allow the child
|
|
* process to be closed. */
|
|
if (++write2_cb_called == 2 && (is_child_process || is_in_process)) {
|
|
uv_close(&ctx2.recv.handle, NULL);
|
|
uv_close(&ctx2.recv2.handle, NULL);
|
|
uv_close((uv_handle_t*)&ctx2.channel, NULL);
|
|
uv_close((uv_handle_t*)&ctx2.listen, NULL);
|
|
}
|
|
}
|
|
|
|
static void read_cb(uv_stream_t* handle,
|
|
ssize_t nread,
|
|
const uv_buf_t* rdbuf) {
|
|
uv_buf_t wrbuf;
|
|
uv_pipe_t* pipe;
|
|
uv_handle_type pending;
|
|
int r;
|
|
union handles* recv;
|
|
uv_write_t* write_req;
|
|
|
|
if (nread == UV_EOF || nread == UV_ECONNABORTED) {
|
|
return;
|
|
}
|
|
|
|
pipe = (uv_pipe_t*) handle;
|
|
do {
|
|
if (++read_cb_count == 2) {
|
|
recv = &ctx2.recv;
|
|
write_req = &ctx2.write_req;
|
|
} else {
|
|
recv = &ctx2.recv2;
|
|
write_req = &ctx2.write_req2;
|
|
}
|
|
|
|
ASSERT(pipe == &ctx2.channel);
|
|
ASSERT(nread >= 0);
|
|
ASSERT(uv_pipe_pending_count(pipe) > 0);
|
|
|
|
pending = uv_pipe_pending_type(pipe);
|
|
ASSERT(pending == UV_NAMED_PIPE || pending == UV_TCP);
|
|
|
|
if (pending == UV_NAMED_PIPE)
|
|
r = uv_pipe_init(ctx2.channel.loop, &recv->pipe, 0);
|
|
else if (pending == UV_TCP)
|
|
r = uv_tcp_init(ctx2.channel.loop, &recv->tcp);
|
|
else
|
|
abort();
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_accept(handle, &recv->stream);
|
|
ASSERT(r == 0);
|
|
|
|
wrbuf = uv_buf_init(".", 1);
|
|
r = uv_write2(write_req,
|
|
(uv_stream_t*)&ctx2.channel,
|
|
&wrbuf,
|
|
1,
|
|
&recv->stream,
|
|
write2_cb);
|
|
ASSERT(r == 0);
|
|
} while (uv_pipe_pending_count(pipe) > 0);
|
|
}
|
|
|
|
static void send_recv_start(void) {
|
|
int r;
|
|
ASSERT(1 == uv_is_readable((uv_stream_t*)&ctx2.channel));
|
|
ASSERT(1 == uv_is_writable((uv_stream_t*)&ctx2.channel));
|
|
ASSERT(0 == uv_is_closing((uv_handle_t*)&ctx2.channel));
|
|
|
|
r = uv_read_start((uv_stream_t*)&ctx2.channel, alloc_cb, read_cb);
|
|
ASSERT(r == 0);
|
|
}
|
|
|
|
static void listen_cb(uv_stream_t* handle, int status) {
|
|
int r;
|
|
ASSERT(handle == (uv_stream_t*)&ctx2.listen);
|
|
ASSERT(status == 0);
|
|
|
|
r = uv_accept((uv_stream_t*)&ctx2.listen, (uv_stream_t*)&ctx2.channel);
|
|
ASSERT(r == 0);
|
|
|
|
send_recv_start();
|
|
}
|
|
|
|
int run_ipc_send_recv_helper(uv_loop_t* loop, int inprocess) {
|
|
int r;
|
|
|
|
is_in_process = inprocess;
|
|
|
|
memset(&ctx2, 0, sizeof(ctx2));
|
|
|
|
r = uv_pipe_init(loop, &ctx2.listen, 0);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_pipe_init(loop, &ctx2.channel, 1);
|
|
ASSERT(r == 0);
|
|
|
|
if (inprocess) {
|
|
r = uv_pipe_bind(&ctx2.listen, TEST_PIPENAME_3);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_listen((uv_stream_t*)&ctx2.listen, SOMAXCONN, listen_cb);
|
|
ASSERT(r == 0);
|
|
} else {
|
|
uv_os_fd_t stdin_handle = uv_convert_fd_to_handle(0);
|
|
r = uv_pipe_open(&ctx2.channel, stdin_handle);
|
|
ASSERT(r == 0);
|
|
|
|
send_recv_start();
|
|
}
|
|
|
|
r = uv_run(loop, UV_RUN_DEFAULT);
|
|
ASSERT(r == 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/* stdin is a duplex channel over which a handle is sent.
|
|
* We receive it and send it back where it came from.
|
|
*/
|
|
int ipc_send_recv_helper(void) {
|
|
int r;
|
|
|
|
r = run_ipc_send_recv_helper(uv_default_loop(), 0);
|
|
ASSERT(r == 0);
|
|
|
|
MAKE_VALGRIND_HAPPY();
|
|
return 0;
|
|
}
|
|
|
|
void ipc_send_recv_helper_threadproc(void* arg) {
|
|
int r;
|
|
uv_loop_t loop;
|
|
|
|
r = uv_loop_init(&loop);
|
|
ASSERT(r == 0);
|
|
|
|
r = run_ipc_send_recv_helper(&loop, 1);
|
|
ASSERT(r == 0);
|
|
|
|
r = uv_loop_close(&loop);
|
|
ASSERT(r == 0);
|
|
}
|