authorgravatar for bingcicle@proton.mebing <bingcicle@proton.me> 2023-03-30 16:51:57+00:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2023-03-30 16:51:57+00:00
log64214b1ca6a295af8521ed6fb3be5a3244a42564
tree0397c845da4c12cd87320e2c0dad087012b27561
parent3357c59cebacb6b60da865376b20d2b307d12ec1
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Change ordering of prep provide buffers args

1 files changed, 8 insertions(+), 8 deletions(-)

lib/std/os/linux/io_uring.zig+8-8
......@@ -897,13 +897,13 @@ pub const IO_Uring = struct {
897897 self: *IO_Uring,
898898 user_data: u64,
899899 buffers: [*]u8,
900 buffers_count: usize,
901900 buffer_size: usize,
901 buffers_count: usize,
902902 group_id: usize,
903903 buffer_id: usize,
904904 ) !*linux.io_uring_sqe {
905905 const sqe = try self.get_sqe();
906 io_uring_prep_provide_buffers(sqe, buffers, buffers_count, buffer_size, group_id, buffer_id);
906 io_uring_prep_provide_buffers(sqe, buffers, buffer_size, buffers_count, group_id, buffer_id);
907907 sqe.user_data = user_data;
908908 return sqe;
909909 }
......@@ -1576,8 +1576,8 @@ pub fn io_uring_prep_linkat(
15761576pub fn io_uring_prep_provide_buffers(
15771577 sqe: *linux.io_uring_sqe,
15781578 buffers: [*]u8,
1579 num: usize,
15801579 buffer_len: usize,
1580 num: usize,
15811581 group_id: usize,
15821582 buffer_id: usize,
15831583) void {
......@@ -2892,7 +2892,7 @@ test "provide_buffers: read" {
28922892 // Provide 4 buffers
28932893
28942894 {
2895 const sqe = try ring.provide_buffers(0xcccccccc, @ptrCast([*]u8, &buffers), buffers.len, buffer_len, group_id, buffer_id);
2895 const sqe = try ring.provide_buffers(0xcccccccc, @ptrCast([*]u8, &buffers), buffer_len, buffers.len, group_id, buffer_id);
28962896 try testing.expectEqual(linux.IORING_OP.PROVIDE_BUFFERS, sqe.opcode);
28972897 try testing.expectEqual(@as(i32, buffers.len), sqe.fd);
28982898 try testing.expectEqual(@as(u32, buffers[0].len), sqe.len);
......@@ -2965,7 +2965,7 @@ test "provide_buffers: read" {
29652965 const reprovided_buffer_id = 2;
29662966
29672967 {
2968 _ = try ring.provide_buffers(0xabababab, @ptrCast([*]u8, &buffers[reprovided_buffer_id]), 1, buffer_len, group_id, reprovided_buffer_id);
2968 _ = try ring.provide_buffers(0xabababab, @ptrCast([*]u8, &buffers[reprovided_buffer_id]), buffer_len, 1, group_id, reprovided_buffer_id);
29692969 try testing.expectEqual(@as(u32, 1), try ring.submit());
29702970
29712971 const cqe = try ring.copy_cqe();
......@@ -3024,7 +3024,7 @@ test "remove_buffers" {
30243024 // Provide 4 buffers
30253025
30263026 {
3027 _ = try ring.provide_buffers(0xcccccccc, @ptrCast([*]u8, &buffers), buffers.len, buffer_len, group_id, buffer_id);
3027 _ = try ring.provide_buffers(0xcccccccc, @ptrCast([*]u8, &buffers), buffer_len, buffers.len, group_id, buffer_id);
30283028 try testing.expectEqual(@as(u32, 1), try ring.submit());
30293029
30303030 const cqe = try ring.copy_cqe();
......@@ -3113,7 +3113,7 @@ test "provide_buffers: accept/connect/send/recv" {
31133113 // Provide 4 buffers
31143114
31153115 {
3116 const sqe = try ring.provide_buffers(0xcccccccc, @ptrCast([*]u8, &buffers), buffers.len, buffer_len, group_id, buffer_id);
3116 const sqe = try ring.provide_buffers(0xcccccccc, @ptrCast([*]u8, &buffers), buffer_len, buffers.len, group_id, buffer_id);
31173117 try testing.expectEqual(linux.IORING_OP.PROVIDE_BUFFERS, sqe.opcode);
31183118 try testing.expectEqual(@as(i32, buffers.len), sqe.fd);
31193119 try testing.expectEqual(@as(u32, buffer_len), sqe.len);
......@@ -3207,7 +3207,7 @@ test "provide_buffers: accept/connect/send/recv" {
32073207 const reprovided_buffer_id = 2;
32083208
32093209 {
3210 _ = try ring.provide_buffers(0xabababab, @ptrCast([*]u8, &buffers[reprovided_buffer_id]), 1, buffer_len, group_id, reprovided_buffer_id);
3210 _ = try ring.provide_buffers(0xabababab, @ptrCast([*]u8, &buffers[reprovided_buffer_id]), buffer_len, 1, group_id, reprovided_buffer_id);
32113211 try testing.expectEqual(@as(u32, 1), try ring.submit());
32123212
32133213 const cqe = try ring.copy_cqe();