authorgravatar for vincent@rischmann.frVincent Rischmann <vincent@rischmann.fr> 2022-05-16 19:48:55+02:00
committergravatar for vincent@rischmann.frVincent Rischmann <vincent@rischmann.fr> 2022-05-25 13:53:09+02:00
log270a5039d4bc09bb5fbe017334d5d9ba6c4ac584
tree1ef45b42d81bd040c090b6fa349ca747cbe8ec32
parent52dd468cc3e279e7d1a764c2c3f6fde13a404a14

io_uring: change recv() to use a RecvBuffer instead

RecvBuffer is equivalent to ReadBuffer but tailored for recv only.

1 files changed, 27 insertions(+), 5 deletions(-)

lib/std/os/linux/io_uring.zig+27-5
......@@ -528,17 +528,39 @@ pub const IO_Uring = struct {
528528 return sqe;
529529 }
530530
531 /// Used to select how the recv call should be handled.
532 pub const RecvBuffer = union(enum) {
533 /// io_uring will recv directly into this buffer
534 buffer: []u8,
535
536 /// io_uring will select a buffer that has previously been provided with `provide_buffers`.
537 /// The buffer group referenced by `group_id` must contain at least one buffer for the recv call to work.
538 /// `len` controls the number of bytes to read into the selected buffer.
539 buffer_selection: struct {
540 group_id: u16,
541 len: usize,
542 },
543 };
544
531545 /// Queues (but does not submit) an SQE to perform a `recv(2)`.
532546 /// Returns a pointer to the SQE.
533547 pub fn recv(
534548 self: *IO_Uring,
535549 user_data: u64,
536550 fd: os.fd_t,
537 buffer: []u8,
551 buffer: RecvBuffer,
538552 flags: u32,
539553 ) !*io_uring_sqe {
540554 const sqe = try self.get_sqe();
541 io_uring_prep_recv(sqe, fd, buffer, flags);
555 switch (buffer) {
556 .buffer => |slice| io_uring_prep_recv(sqe, fd, slice, flags),
557 .buffer_selection => |selection| {
558 io_uring_prep_rw(.RECV, sqe, fd, 0, selection.len, 0);
559 sqe.rw_flags = flags;
560 sqe.flags |= linux.IOSQE_BUFFER_SELECT;
561 sqe.buf_index = selection.group_id;
562 },
563 }
542564 sqe.user_data = user_data;
543565 return sqe;
544566 }
......@@ -2014,7 +2036,7 @@ test "accept/connect/send/recv" {
20142036
20152037 const send = try ring.send(0xeeeeeeee, client, buffer_send[0..], 0);
20162038 send.flags |= linux.IOSQE_IO_LINK;
2017 _ = try ring.recv(0xffffffff, cqe_accept.res, buffer_recv[0..], 0);
2039 _ = try ring.recv(0xffffffff, cqe_accept.res, .{ .buffer = buffer_recv[0..] }, 0);
20182040 try testing.expectEqual(@as(u32, 2), try ring.submit());
20192041
20202042 const cqe_send = try ring.copy_cqe();
......@@ -2282,7 +2304,7 @@ test "accept/connect/recv/link_timeout" {
22822304 .flags = 0,
22832305 }, cqe_connect);
22842306
2285 const sqe_recv = try ring.recv(0xffffffff, cqe_accept.res, buffer_recv[0..], 0);
2307 const sqe_recv = try ring.recv(0xffffffff, cqe_accept.res, .{ .buffer = buffer_recv[0..] }, 0);
22862308 sqe_recv.flags |= linux.IOSQE_IO_LINK;
22872309
22882310 const ts = os.linux.kernel_timespec{ .tv_sec = 0, .tv_nsec = 1000000 };
......@@ -2469,7 +2491,7 @@ test "accept/connect/recv/cancel" {
24692491 .flags = 0,
24702492 }, cqe_connect);
24712493
2472 _ = try ring.recv(0xffffffff, cqe_accept.res, buffer_recv[0..], 0);
2494 _ = try ring.recv(0xffffffff, cqe_accept.res, .{ .buffer = buffer_recv[0..] }, 0);
24732495 try testing.expectEqual(@as(u32, 1), try ring.submit());
24742496
24752497 const sqe_cancel = try ring.cancel(0x99999999, 0xffffffff, 0);