libuv 1.47.0.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@4615 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
2023-11-07 17:30:39 +00:00
parent 889773c38d
commit ee9cb63327
226 changed files with 6648 additions and 6444 deletions

View File

@@ -68,16 +68,16 @@ static void on_connection(uv_stream_t* server, int status) {
if (!local_conn_accepted) {
/* Accept the connection and close it. Also and close the server. */
ASSERT_EQ(status, 0);
ASSERT_OK(status);
ASSERT_PTR_EQ(&tcp_server, server);
conn = malloc(sizeof(*conn));
ASSERT_NOT_NULL(conn);
r = uv_tcp_init(server->loop, conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_accept(server, (uv_stream_t*)conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
uv_close((uv_handle_t*)conn, close_server_conn_cb);
uv_close((uv_handle_t*)server, NULL);
@@ -91,8 +91,8 @@ static void exit_cb(uv_process_t* process,
int term_signal) {
printf("exit_cb\n");
exit_cb_called++;
ASSERT_EQ(exit_status, 0);
ASSERT_EQ(term_signal, 0);
ASSERT_OK(exit_status);
ASSERT_OK(term_signal);
uv_close((uv_handle_t*)process, NULL);
}
@@ -126,14 +126,14 @@ static void make_many_connections(void) {
ASSERT_NOT_NULL(conn);
r = uv_tcp_init(uv_default_loop(), &conn->conn);
ASSERT_EQ(r, 0);
ASSERT_EQ(0, uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
ASSERT_OK(r);
ASSERT_OK(uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
r = uv_tcp_connect(&conn->conn_req,
(uv_tcp_t*) &conn->conn,
(const struct sockaddr*) &addr,
connect_cb);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
conn->conn.data = conn;
}
@@ -179,13 +179,13 @@ static void on_read(uv_stream_t* handle,
/* Accept the pending TCP server, and start listening on it. */
ASSERT_EQ(pending, UV_TCP);
r = uv_tcp_init(uv_default_loop(), &tcp_server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_accept((uv_stream_t*)pipe, (uv_stream_t*)&tcp_server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_listen((uv_stream_t*)&tcp_server, BACKLOG, on_connection);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
tcp_server_listening = 1;
@@ -194,13 +194,13 @@ static void on_read(uv_stream_t* handle,
outbuf = uv_buf_init("foobar\n", 7);
r = uv_write(&write_req, (uv_stream_t*)pipe, &outbuf, 1, NULL);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
/* Create a bunch of connections to get both servers to accept. */
make_many_connections();
} else if (memcmp("accepted_connection\n", buf->base, nread) == 0) {
/* Remote server has accepted a connection. Close the channel. */
ASSERT_EQ(0, uv_pipe_pending_count(pipe));
ASSERT_OK(uv_pipe_pending_count(pipe));
ASSERT_EQ(pending, UV_UNKNOWN_HANDLE);
remote_conn_accepted = 1;
uv_close((uv_handle_t*)&channel, NULL);
@@ -248,28 +248,28 @@ static void on_read_listen_after_bound_twice(uv_stream_t* handle,
/* Accept the first TCP server, and start listening on it. */
ASSERT_EQ(pending, UV_TCP);
r = uv_tcp_init(uv_default_loop(), &tcp_server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_accept((uv_stream_t*)pipe, (uv_stream_t*)&tcp_server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_listen((uv_stream_t*)&tcp_server, BACKLOG, on_connection);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
} else if (read_cb_called == 2) {
/* Accept the second TCP server, and start listening on it. */
ASSERT_EQ(pending, UV_TCP);
r = uv_tcp_init(uv_default_loop(), &tcp_server2);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_accept((uv_stream_t*)pipe, (uv_stream_t*)&tcp_server2);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_listen((uv_stream_t*)&tcp_server2, BACKLOG, on_connection);
ASSERT_EQ(r, UV_EADDRINUSE);
uv_close((uv_handle_t*)&tcp_server, NULL);
uv_close((uv_handle_t*)&tcp_server2, NULL);
ASSERT_EQ(0, uv_pipe_pending_count(pipe));
ASSERT_OK(uv_pipe_pending_count(pipe));
uv_close((uv_handle_t*)&channel, NULL);
}
@@ -288,12 +288,12 @@ void spawn_helper(uv_pipe_t* channel,
uv_stdio_container_t stdio[3];
r = uv_pipe_init(uv_default_loop(), channel, 1);
ASSERT_EQ(r, 0);
ASSERT_NE(channel->ipc, 0);
ASSERT_OK(r);
ASSERT_NE(0, channel->ipc);
exepath_size = sizeof(exepath);
r = uv_exepath(exepath, &exepath_size);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
exepath[exepath_size] = '\0';
args[0] = exepath;
@@ -315,12 +315,12 @@ void spawn_helper(uv_pipe_t* channel,
stdio[2].data.fd = 2;
r = uv_spawn(uv_default_loop(), process, &options);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
}
static void on_tcp_write(uv_write_t* req, int status) {
ASSERT_EQ(status, 0);
ASSERT_OK(status);
ASSERT_PTR_EQ(req->handle, &tcp_connection);
tcp_write_cb_called++;
}
@@ -385,10 +385,10 @@ static void on_read_connection(uv_stream_t* handle,
/* Accept the pending TCP connection */
ASSERT_EQ(pending, UV_TCP);
r = uv_tcp_init(uv_default_loop(), &tcp_connection);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_accept(handle, (uv_stream_t*)&tcp_connection);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
/* Make sure that the expected data is correctly multiplexed. */
ASSERT_MEM_EQ("hello\n", buf->base, nread);
@@ -397,10 +397,10 @@ static void on_read_connection(uv_stream_t* handle,
outbuf = uv_buf_init("world\n", 6);
r = uv_write(&write_req, (uv_stream_t*)&tcp_connection, &outbuf, 1,
on_tcp_write);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_read_start((uv_stream_t*)&tcp_connection, on_read_alloc, on_tcp_read);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
free(buf->base);
}
@@ -422,7 +422,7 @@ static int run_ipc_test(const char* helper, uv_read_cb read_cb) {
uv_read_start((uv_stream_t*)&channel, on_alloc, read_cb);
r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0;
@@ -434,10 +434,10 @@ TEST_IMPL(ipc_listen_before_write) {
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
#endif
int r = run_ipc_test("ipc_helper_listen_before_write", on_read);
ASSERT_EQ(local_conn_accepted, 1);
ASSERT_EQ(remote_conn_accepted, 1);
ASSERT_EQ(read_cb_called, 1);
ASSERT_EQ(exit_cb_called, 1);
ASSERT_EQ(1, local_conn_accepted);
ASSERT_EQ(1, remote_conn_accepted);
ASSERT_EQ(1, read_cb_called);
ASSERT_EQ(1, exit_cb_called);
return r;
}
@@ -447,10 +447,10 @@ TEST_IMPL(ipc_listen_after_write) {
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
#endif
int r = run_ipc_test("ipc_helper_listen_after_write", on_read);
ASSERT_EQ(local_conn_accepted, 1);
ASSERT_EQ(remote_conn_accepted, 1);
ASSERT_EQ(read_cb_called, 1);
ASSERT_EQ(exit_cb_called, 1);
ASSERT_EQ(1, local_conn_accepted);
ASSERT_EQ(1, remote_conn_accepted);
ASSERT_EQ(1, read_cb_called);
ASSERT_EQ(1, exit_cb_called);
return r;
}
@@ -460,10 +460,10 @@ TEST_IMPL(ipc_tcp_connection) {
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
#endif
int r = run_ipc_test("ipc_helper_tcp_connection", on_read_connection);
ASSERT_EQ(read_cb_called, 1);
ASSERT_EQ(tcp_write_cb_called, 1);
ASSERT_EQ(tcp_read_cb_called, 1);
ASSERT_EQ(exit_cb_called, 1);
ASSERT_EQ(1, read_cb_called);
ASSERT_EQ(1, tcp_write_cb_called);
ASSERT_EQ(1, tcp_read_cb_called);
ASSERT_EQ(1, exit_cb_called);
return r;
}
@@ -474,20 +474,20 @@ TEST_IMPL(listen_with_simultaneous_accepts) {
int r;
struct sockaddr_in addr;
ASSERT_EQ(0, uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
r = uv_tcp_init(uv_default_loop(), &server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_bind(&server, (const struct sockaddr*) &addr, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_simultaneous_accepts(&server, 1);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_listen((uv_stream_t*)&server, SOMAXCONN, NULL);
ASSERT_EQ(r, 0);
ASSERT_EQ(server.reqs_pending, 32);
ASSERT_OK(r);
ASSERT_EQ(32, server.reqs_pending);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0;
@@ -499,20 +499,20 @@ TEST_IMPL(listen_no_simultaneous_accepts) {
int r;
struct sockaddr_in addr;
ASSERT_EQ(0, uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
r = uv_tcp_init(uv_default_loop(), &server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_bind(&server, (const struct sockaddr*) &addr, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_simultaneous_accepts(&server, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_listen((uv_stream_t*)&server, SOMAXCONN, NULL);
ASSERT_EQ(r, 0);
ASSERT_EQ(server.reqs_pending, 1);
ASSERT_OK(r);
ASSERT_EQ(1, server.reqs_pending);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0;
@@ -523,8 +523,8 @@ TEST_IMPL(ipc_listen_after_bind_twice) {
RETURN_SKIP(NO_SEND_HANDLE_ON_PIPE);
#endif
int r = run_ipc_test("ipc_helper_bind_twice", on_read_listen_after_bound_twice);
ASSERT_EQ(read_cb_called, 2);
ASSERT_EQ(exit_cb_called, 1);
ASSERT_EQ(2, read_cb_called);
ASSERT_EQ(1, exit_cb_called);
return r;
}
#endif
@@ -532,7 +532,7 @@ TEST_IMPL(ipc_listen_after_bind_twice) {
TEST_IMPL(ipc_send_zero) {
int r;
r = run_ipc_test("ipc_helper_send_zero", on_read_send_zero);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
return 0;
}
@@ -563,7 +563,7 @@ static void tcp_connection_write_cb(uv_write_t* req, int status) {
static void send_zero_write_cb(uv_write_t* req, int status) {
ASSERT_EQ(status, 0);
ASSERT_OK(status);
send_zero_write++;
}
@@ -591,7 +591,7 @@ static void on_tcp_child_process_read(uv_stream_t* tcp,
/* Write to the socket */
outbuf = uv_buf_init("hello again\n", 12);
r = uv_write(&conn.tcp_write_req, tcp, &outbuf, 1, tcp_connection_write_cb);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
tcp_conn_read_cb_called++;
}
@@ -600,9 +600,9 @@ static void on_tcp_child_process_read(uv_stream_t* tcp,
static void connect_child_process_cb(uv_connect_t* req, int status) {
int r;
ASSERT_EQ(status, 0);
ASSERT_OK(status);
r = uv_read_start(req->handle, on_read_alloc, on_tcp_child_process_read);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
}
@@ -615,21 +615,21 @@ static void ipc_on_connection(uv_stream_t* server, int status) {
* Accept the connection and close it. Also let the other
* side know.
*/
ASSERT_EQ(status, 0);
ASSERT_OK(status);
ASSERT_PTR_EQ(&tcp_server, server);
r = uv_tcp_init(server->loop, &conn.conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_accept(server, (uv_stream_t*)&conn.conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
uv_close((uv_handle_t*)&conn.conn, close_cb);
buf = uv_buf_init("accepted_connection\n", 20);
r = uv_write2(&conn_notify_req, (uv_stream_t*)&channel, &buf, 1,
NULL, conn_notify_write_cb);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
connection_accepted = 1;
}
@@ -646,28 +646,28 @@ static void ipc_on_connection_tcp_conn(uv_stream_t* server, int status) {
uv_buf_t buf;
uv_tcp_t* conn;
ASSERT_EQ(status, 0);
ASSERT_OK(status);
ASSERT_PTR_EQ(&tcp_server, server);
conn = malloc(sizeof(*conn));
ASSERT_NOT_NULL(conn);
r = uv_tcp_init(server->loop, conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_accept(server, (uv_stream_t*)conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
/* Send the accepted connection to the other process */
buf = uv_buf_init("hello\n", 6);
r = uv_write2(&conn_notify_req, (uv_stream_t*)&channel, &buf, 1,
(uv_stream_t*)conn, NULL);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_read_start((uv_stream_t*) conn,
on_read_alloc,
on_tcp_child_process_read);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
uv_close((uv_handle_t*)conn, close_and_free_cb);
}
@@ -682,44 +682,44 @@ int ipc_helper(int listen_after_write) {
int r;
uv_buf_t buf;
ASSERT_EQ(0, uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
r = uv_pipe_init(uv_default_loop(), &channel, 1);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
uv_pipe_open(&channel, 0);
ASSERT_EQ(1, uv_is_readable((uv_stream_t*) &channel));
ASSERT_EQ(1, uv_is_writable((uv_stream_t*) &channel));
ASSERT_EQ(0, uv_is_closing((uv_handle_t*) &channel));
ASSERT_OK(uv_is_closing((uv_handle_t*) &channel));
r = uv_tcp_init(uv_default_loop(), &tcp_server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_bind(&tcp_server, (const struct sockaddr*) &addr, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
if (!listen_after_write) {
r = uv_listen((uv_stream_t*)&tcp_server, BACKLOG, ipc_on_connection);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
}
buf = uv_buf_init("hello\n", 6);
r = uv_write2(&write_req, (uv_stream_t*)&channel, &buf, 1,
(uv_stream_t*)&tcp_server, NULL);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
if (listen_after_write) {
r = uv_listen((uv_stream_t*)&tcp_server, BACKLOG, ipc_on_connection);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
}
notify_parent_process();
r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
ASSERT_EQ(connection_accepted, 1);
ASSERT_EQ(close_cb_called, 3);
ASSERT_EQ(1, connection_accepted);
ASSERT_EQ(3, close_cb_called);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0;
@@ -736,43 +736,43 @@ int ipc_helper_tcp_connection(void) {
struct sockaddr_in addr;
r = uv_pipe_init(uv_default_loop(), &channel, 1);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
uv_pipe_open(&channel, 0);
ASSERT_EQ(1, uv_is_readable((uv_stream_t*) &channel));
ASSERT_EQ(1, uv_is_writable((uv_stream_t*) &channel));
ASSERT_EQ(0, uv_is_closing((uv_handle_t*) &channel));
ASSERT_OK(uv_is_closing((uv_handle_t*) &channel));
r = uv_tcp_init(uv_default_loop(), &tcp_server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
ASSERT_EQ(0, uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
r = uv_tcp_bind(&tcp_server, (const struct sockaddr*) &addr, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_listen((uv_stream_t*)&tcp_server, BACKLOG, ipc_on_connection_tcp_conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
/* Make a connection to the server */
r = uv_tcp_init(uv_default_loop(), &conn.conn);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
ASSERT_EQ(0, uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
ASSERT_OK(uv_ip4_addr("127.0.0.1", TEST_PORT, &addr));
r = uv_tcp_connect(&conn.conn_req,
(uv_tcp_t*) &conn.conn,
(const struct sockaddr*) &addr,
connect_child_process_cb);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
ASSERT_EQ(tcp_conn_read_cb_called, 1);
ASSERT_EQ(tcp_conn_write_cb_called, 1);
ASSERT_EQ(close_cb_called, 4);
ASSERT_EQ(1, tcp_conn_read_cb_called);
ASSERT_EQ(1, tcp_conn_write_cb_called);
ASSERT_EQ(4, close_cb_called);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0;
@@ -787,38 +787,38 @@ int ipc_helper_bind_twice(void) {
int r;
uv_buf_t buf;
ASSERT_EQ(0, uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
ASSERT_OK(uv_ip4_addr("0.0.0.0", TEST_PORT, &addr));
r = uv_pipe_init(uv_default_loop(), &channel, 1);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
uv_pipe_open(&channel, 0);
ASSERT_EQ(1, uv_is_readable((uv_stream_t*) &channel));
ASSERT_EQ(1, uv_is_writable((uv_stream_t*) &channel));
ASSERT_EQ(0, uv_is_closing((uv_handle_t*) &channel));
ASSERT_OK(uv_is_closing((uv_handle_t*) &channel));
buf = uv_buf_init("hello\n", 6);
r = uv_tcp_init(uv_default_loop(), &tcp_server);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_init(uv_default_loop(), &tcp_server2);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_bind(&tcp_server, (const struct sockaddr*) &addr, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_tcp_bind(&tcp_server2, (const struct sockaddr*) &addr, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_write2(&write_req, (uv_stream_t*)&channel, &buf, 1,
(uv_stream_t*)&tcp_server, NULL);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_write2(&write_req2, (uv_stream_t*)&channel, &buf, 1,
(uv_stream_t*)&tcp_server2, NULL);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0;
@@ -831,13 +831,13 @@ int ipc_helper_send_zero(void) {
zero_buf = uv_buf_init(0, 0);
r = uv_pipe_init(uv_default_loop(), &channel, 0);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
uv_pipe_open(&channel, 0);
ASSERT_EQ(1, uv_is_readable((uv_stream_t*) &channel));
ASSERT_EQ(1, uv_is_writable((uv_stream_t*) &channel));
ASSERT_EQ(0, uv_is_closing((uv_handle_t*) &channel));
ASSERT_OK(uv_is_closing((uv_handle_t*) &channel));
r = uv_write(&write_req,
(uv_stream_t*)&channel,
@@ -845,12 +845,12 @@ int ipc_helper_send_zero(void) {
1,
send_zero_write_cb);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
ASSERT_EQ(r, 0);
ASSERT_OK(r);
ASSERT_EQ(send_zero_write, 1);
ASSERT_EQ(1, send_zero_write);
MAKE_VALGRIND_HAPPY(uv_default_loop());
return 0;