Skip to content

io_uring: let the OS choose a free local port for all tests #14910

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

Merged
merged 1 commit into from
Jul 25, 2023
Merged

io_uring: let the OS choose a free local port for all tests #14910

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
51 changes: 15 additions & 36 deletions lib/std/os/linux/io_uring.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1978,11 +1978,6 @@ test "close" {
test "accept/connect/send/recv" {
if (builtin.os.tag != .linux) return error.SkipZigTest;

if (true) {
// https://github.com/ziglang/zig/issues/14907
return error.SkipZigTest;
}

var ring = IO_Uring.init(16, 0) catch |err| switch (err) {
error.SystemOutdated => return error.SkipZigTest,
error.PermissionDenied => return error.SkipZigTest,
Expand Down Expand Up @@ -2024,27 +2019,25 @@ test "accept/connect/send/recv" {
test "sendmsg/recvmsg" {
if (builtin.os.tag != .linux) return error.SkipZigTest;

if (true) {
// https://github.com/ziglang/zig/issues/14907
return error.SkipZigTest;
}

var ring = IO_Uring.init(2, 0) catch |err| switch (err) {
error.SystemOutdated => return error.SkipZigTest,
error.PermissionDenied => return error.SkipZigTest,
else => return err,
};
defer ring.deinit();

if (true) @compileError("don't hard code port numbers in unit tests"); // https://github.com/ziglang/zig/issues/14907
const address_server = try net.Address.parseIp4("127.0.0.1", 3131);
var address_server = try net.Address.parseIp4("127.0.0.1", 0);

const server = try os.socket(address_server.any.family, os.SOCK.DGRAM, 0);
defer os.close(server);
try os.setsockopt(server, os.SOL.SOCKET, os.SO.REUSEPORT, &mem.toBytes(@as(c_int, 1)));
try os.setsockopt(server, os.SOL.SOCKET, os.SO.REUSEADDR, &mem.toBytes(@as(c_int, 1)));
try os.bind(server, &address_server.any, address_server.getOsSockLen());

// set address_server to the OS-chosen IP/port.
var slen: os.socklen_t = address_server.getOsSockLen();
try os.getsockname(server, &address_server.any, &slen);

const client = try os.socket(address_server.any.family, os.SOCK.DGRAM, 0);
defer os.close(client);

Expand Down Expand Up @@ -2236,11 +2229,6 @@ test "timeout_remove" {
test "accept/connect/recv/link_timeout" {
if (builtin.os.tag != .linux) return error.SkipZigTest;

if (true) {
// https://github.com/ziglang/zig/issues/14907
return error.SkipZigTest;
}

var ring = IO_Uring.init(16, 0) catch |err| switch (err) {
error.SystemOutdated => return error.SkipZigTest,
error.PermissionDenied => return error.SkipZigTest,
Expand Down Expand Up @@ -2391,11 +2379,6 @@ test "statx" {
test "accept/connect/recv/cancel" {
if (builtin.os.tag != .linux) return error.SkipZigTest;

if (true) {
// https://github.com/ziglang/zig/issues/14907
return error.SkipZigTest;
}

var ring = IO_Uring.init(16, 0) catch |err| switch (err) {
error.SystemOutdated => return error.SkipZigTest,
error.PermissionDenied => return error.SkipZigTest,
Expand Down Expand Up @@ -2533,20 +2516,14 @@ test "register_files_update" {
test "shutdown" {
if (builtin.os.tag != .linux) return error.SkipZigTest;

if (true) {
// https://github.com/ziglang/zig/issues/14907
return error.SkipZigTest;
}

var ring = IO_Uring.init(16, 0) catch |err| switch (err) {
error.SystemOutdated => return error.SkipZigTest,
error.PermissionDenied => return error.SkipZigTest,
else => return err,
};
defer ring.deinit();

if (true) @compileError("don't hard code port numbers in unit tests"); // https://github.com/ziglang/zig/issues/14907
const address = try net.Address.parseIp4("127.0.0.1", 3131);
var address = try net.Address.parseIp4("127.0.0.1", 0);

// Socket bound, expect shutdown to work
{
Expand All @@ -2556,6 +2533,10 @@ test "shutdown" {
try os.bind(server, &address.any, address.getOsSockLen());
try os.listen(server, 1);

// set address to the OS-chosen IP/port.
var slen: os.socklen_t = address.getOsSockLen();
try os.getsockname(server, &address.any, &slen);

var shutdown_sqe = try ring.shutdown(0x445445445, server, os.linux.SHUT.RD);
try testing.expectEqual(linux.IORING_OP.SHUTDOWN, shutdown_sqe.opcode);
try testing.expectEqual(@as(i32, server), shutdown_sqe.fd);
Expand Down Expand Up @@ -3091,11 +3072,6 @@ test "remove_buffers" {
test "provide_buffers: accept/connect/send/recv" {
if (builtin.os.tag != .linux) return error.SkipZigTest;

if (true) {
// https://github.com/ziglang/zig/issues/14907
return error.SkipZigTest;
}

var ring = IO_Uring.init(16, 0) catch |err| switch (err) {
error.SystemOutdated => return error.SkipZigTest,
error.PermissionDenied => return error.SkipZigTest,
Expand Down Expand Up @@ -3272,8 +3248,7 @@ const SocketTestHarness = struct {
fn createSocketTestHarness(ring: *IO_Uring) !SocketTestHarness {
// Create a TCP server socket

if (true) @compileError("don't hard code port numbers in unit tests"); // https://github.com/ziglang/zig/issues/14907
const address = try net.Address.parseIp4("127.0.0.1", 3131);
var address = try net.Address.parseIp4("127.0.0.1", 0);
const kernel_backlog = 1;
const listener_socket = try os.socket(address.any.family, os.SOCK.STREAM | os.SOCK.CLOEXEC, 0);
errdefer os.closeSocket(listener_socket);
Expand All @@ -3282,6 +3257,10 @@ fn createSocketTestHarness(ring: *IO_Uring) !SocketTestHarness {
try os.bind(listener_socket, &address.any, address.getOsSockLen());
try os.listen(listener_socket, kernel_backlog);

// set address to the OS-chosen IP/port.
var slen: os.socklen_t = address.getOsSockLen();
try os.getsockname(listener_socket, &address.any, &slen);

// Submit 1 accept
var accept_addr: os.sockaddr = undefined;
var accept_addr_len: os.socklen_t = @sizeOf(@TypeOf(accept_addr));
Expand Down