authorgravatar for joran@ronomon.comJoran Dirk Greef <joran@ronomon.com> 2020-10-04 16:57:04+02:00
committergravatar for joran@ronomon.comJoran Dirk Greef <joran@ronomon.com> 2020-10-04 16:57:04+02:00
log958ff087f263a98986abfbc2a471d7e974813b91
tree08e3f46c3a3a675acdfc45525aaa7ef8ada5da20
parent72bdfa5bdda561e640206082f1deb5f80ebebfa7

Use const wherever possible

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

lib/std/os/linux/io_uring.zig+29-29
......@@ -478,7 +478,7 @@ pub const IO_Uring = struct {
478478 self: *IO_Uring,
479479 user_data: u64,
480480 fd: os.fd_t,
481 buffer: []u8,
481 buffer: []const u8,
482482 flags: u32
483483 ) !*io_uring_sqe {
484484 const sqe = try self.get_sqe();
......@@ -852,7 +852,7 @@ test "nop" {
852852 testing.expectEqual(@as(os.fd_t, -1), ring.fd);
853853 }
854854
855 var sqe = try ring.nop(0xaaaaaaaa);
855 const sqe = try ring.nop(0xaaaaaaaa);
856856 testing.expectEqual(io_uring_sqe {
857857 .opcode = .NOP,
858858 .flags = 0,
......@@ -891,7 +891,7 @@ test "nop" {
891891 testing.expectEqual(@as(u32, 1), ring.cq.head.*);
892892 testing.expectEqual(@as(u32, 0), ring.cq_ready());
893893
894 var sqe_barrier = try ring.nop(0xbbbbbbbb);
894 const sqe_barrier = try ring.nop(0xbbbbbbbb);
895895 sqe_barrier.flags |= linux.IOSQE_IO_DRAIN;
896896 testing.expectEqual(@as(u32, 1), try ring.submit());
897897 testing.expectEqual(io_uring_cqe {
......@@ -931,7 +931,7 @@ test "readv" {
931931
932932 var buffer = [_]u8{42} ** 128;
933933 var iovecs = [_]os.iovec{ os.iovec { .iov_base = &buffer, .iov_len = buffer.len } };
934 var sqe = try ring.readv(0xcccccccc, fd_index, iovecs[0..], 0);
934 const sqe = try ring.readv(0xcccccccc, fd_index, iovecs[0..], 0);
935935 testing.expectEqual(linux.IORING_OP.READV, sqe.opcode);
936936 sqe.flags |= linux.IOSQE_FIXED_FILE;
937937
......@@ -963,8 +963,8 @@ test "writev/fsync/readv" {
963963 defer std.fs.cwd().deleteFile(path) catch {};
964964 const fd = file.handle;
965965
966 var buffer_write = [_]u8{42} ** 128;
967 var iovecs_write = [_]os.iovec_const {
966 const buffer_write = [_]u8{42} ** 128;
967 const iovecs_write = [_]os.iovec_const {
968968 os.iovec_const { .iov_base = &buffer_write, .iov_len = buffer_write.len }
969969 };
970970 var buffer_read = [_]u8{0} ** 128;
......@@ -972,17 +972,17 @@ test "writev/fsync/readv" {
972972 os.iovec { .iov_base = &buffer_read, .iov_len = buffer_read.len }
973973 };
974974
975 var sqe_writev = try ring.writev(0xdddddddd, fd, iovecs_write[0..], 17);
975 const sqe_writev = try ring.writev(0xdddddddd, fd, iovecs_write[0..], 17);
976976 testing.expectEqual(linux.IORING_OP.WRITEV, sqe_writev.opcode);
977977 testing.expectEqual(@as(u64, 17), sqe_writev.off);
978978 sqe_writev.flags |= linux.IOSQE_IO_LINK;
979979
980 var sqe_fsync = try ring.fsync(0xeeeeeeee, fd, 0);
980 const sqe_fsync = try ring.fsync(0xeeeeeeee, fd, 0);
981981 testing.expectEqual(linux.IORING_OP.FSYNC, sqe_fsync.opcode);
982982 testing.expectEqual(fd, sqe_fsync.fd);
983983 sqe_fsync.flags |= linux.IOSQE_IO_LINK;
984984
985 var sqe_readv = try ring.readv(0xffffffff, fd, iovecs_read[0..], 17);
985 const sqe_readv = try ring.readv(0xffffffff, fd, iovecs_read[0..], 17);
986986 testing.expectEqual(linux.IORING_OP.READV, sqe_readv.opcode);
987987 testing.expectEqual(@as(u64, 17), sqe_readv.off);
988988
......@@ -1031,19 +1031,19 @@ test "write/read" {
10311031 defer std.fs.cwd().deleteFile(path) catch {};
10321032 const fd = file.handle;
10331033
1034 var buffer_write = [_]u8{97} ** 20;
1034 const buffer_write = [_]u8{97} ** 20;
10351035 var buffer_read = [_]u8{98} ** 20;
1036 var sqe_write = try ring.write(123, fd, buffer_write[0..], 10);
1036 const sqe_write = try ring.write(123, fd, buffer_write[0..], 10);
10371037 testing.expectEqual(linux.IORING_OP.WRITE, sqe_write.opcode);
10381038 testing.expectEqual(@as(u64, 10), sqe_write.off);
10391039 sqe_write.flags |= linux.IOSQE_IO_LINK;
1040 var sqe_read = try ring.read(456, fd, buffer_read[0..], 10);
1040 const sqe_read = try ring.read(456, fd, buffer_read[0..], 10);
10411041 testing.expectEqual(linux.IORING_OP.READ, sqe_read.opcode);
10421042 testing.expectEqual(@as(u64, 10), sqe_read.off);
10431043 testing.expectEqual(@as(u32, 2), try ring.submit());
10441044
1045 var cqe_write = try ring.copy_cqe();
1046 var cqe_read = try ring.copy_cqe();
1045 const cqe_write = try ring.copy_cqe();
1046 const cqe_read = try ring.copy_cqe();
10471047 // Prior to Linux Kernel 5.6 this is the only way to test for read/write support:
10481048 // https://lwn.net/Articles/809820/
10491049 if (cqe_write.res == -linux.EINVAL) return error.SkipZigTest;
......@@ -1076,7 +1076,7 @@ test "openat/close" {
10761076
10771077 const flags: u32 = os.O_CLOEXEC | os.O_RDWR | os.O_CREAT;
10781078 const mode: os.mode_t = 0o666;
1079 var sqe_openat = try ring.openat(789, linux.AT_FDCWD, path, flags, mode);
1079 const sqe_openat = try ring.openat(789, linux.AT_FDCWD, path, flags, mode);
10801080 testing.expectEqual(io_uring_sqe {
10811081 .opcode = .OPENAT,
10821082 .flags = 0,
......@@ -1094,7 +1094,7 @@ test "openat/close" {
10941094 }, sqe_openat.*);
10951095 testing.expectEqual(@as(u32, 1), try ring.submit());
10961096
1097 var cqe_openat = try ring.copy_cqe();
1097 const cqe_openat = try ring.copy_cqe();
10981098 testing.expectEqual(@as(u64, 789), cqe_openat.user_data);
10991099 if (cqe_openat.res == -linux.EINVAL) return error.SkipZigTest;
11001100 // AT_FDCWD is not fully supported before kernel 5.6:
......@@ -1107,12 +1107,12 @@ test "openat/close" {
11071107 testing.expect(cqe_openat.res > 0);
11081108 testing.expectEqual(@as(u32, 0), cqe_openat.flags);
11091109
1110 var sqe_close = try ring.close(1011, cqe_openat.res);
1110 const sqe_close = try ring.close(1011, cqe_openat.res);
11111111 testing.expectEqual(linux.IORING_OP.CLOSE, sqe_close.opcode);
11121112 testing.expectEqual(cqe_openat.res, sqe_close.fd);
11131113 testing.expectEqual(@as(u32, 1), try ring.submit());
11141114
1115 var cqe_close = try ring.copy_cqe();
1115 const cqe_close = try ring.copy_cqe();
11161116 if (cqe_close.res == -linux.EINVAL) return error.SkipZigTest;
11171117 testing.expectEqual(linux.io_uring_cqe {
11181118 .user_data = 1011,
......@@ -1131,7 +1131,7 @@ test "accept/connect/send/recv" {
11311131 };
11321132 defer ring.deinit();
11331133
1134 var address = try net.Address.parseIp4("127.0.0.1", 3131);
1134 const address = try net.Address.parseIp4("127.0.0.1", 3131);
11351135 const kernel_backlog = 1;
11361136 const server = try os.socket(address.any.family, os.SOCK_STREAM | os.SOCK_CLOEXEC, 0);
11371137 defer os.close(server);
......@@ -1139,17 +1139,17 @@ test "accept/connect/send/recv" {
11391139 try os.bind(server, &address.any, address.getOsSockLen());
11401140 try os.listen(server, kernel_backlog);
11411141
1142 var buffer_send = [_]u8{1,0,1,0,1,0,1,0,1,0};
1143 var buffer_recv = [_]u8{0,1,0,1,0};
1142 const buffer_send = [_]u8{ 1,0,1,0,1,0,1,0,1,0 };
1143 var buffer_recv = [_]u8{ 0,1,0,1,0 };
11441144
11451145 var accept_addr: os.sockaddr = undefined;
11461146 var accept_addr_len: os.socklen_t = @sizeOf(@TypeOf(accept_addr));
1147 var accept = try ring.accept(0xaaaaaaaa, server, &accept_addr, &accept_addr_len, 0);
1147 const accept = try ring.accept(0xaaaaaaaa, server, &accept_addr, &accept_addr_len, 0);
11481148 testing.expectEqual(@as(u32, 1), try ring.submit());
11491149
11501150 const client = try os.socket(address.any.family, os.SOCK_STREAM | os.SOCK_CLOEXEC, 0);
11511151 defer os.close(client);
1152 var connect = try ring.connect(0xcccccccc, client, &address.any, address.getOsSockLen());
1152 const connect = try ring.connect(0xcccccccc, client, &address.any, address.getOsSockLen());
11531153 testing.expectEqual(@as(u32, 1), try ring.submit());
11541154
11551155 var cqe_accept = try ring.copy_cqe();
......@@ -1159,8 +1159,8 @@ test "accept/connect/send/recv" {
11591159
11601160 // The accept/connect CQEs may arrive in any order, the connect CQE will sometimes come first:
11611161 if (cqe_accept.user_data == 0xcccccccc and cqe_connect.user_data == 0xaaaaaaaa) {
1162 var a = cqe_accept;
1163 var b = cqe_connect;
1162 const a = cqe_accept;
1163 const b = cqe_connect;
11641164 cqe_accept = b;
11651165 cqe_connect = a;
11661166 }
......@@ -1175,12 +1175,12 @@ test "accept/connect/send/recv" {
11751175 .flags = 0,
11761176 }, cqe_connect);
11771177
1178 var send = try ring.send(0xeeeeeeee, client, buffer_send[0..], 0);
1178 const send = try ring.send(0xeeeeeeee, client, buffer_send[0..], 0);
11791179 send.flags |= linux.IOSQE_IO_LINK;
1180 var recv = try ring.recv(0xffffffff, cqe_accept.res, buffer_recv[0..], 0);
1180 const recv = try ring.recv(0xffffffff, cqe_accept.res, buffer_recv[0..], 0);
11811181 testing.expectEqual(@as(u32, 2), try ring.submit());
11821182
1183 var cqe_send = try ring.copy_cqe();
1183 const cqe_send = try ring.copy_cqe();
11841184 if (cqe_send.res == -linux.EINVAL) return error.SkipZigTest;
11851185 testing.expectEqual(linux.io_uring_cqe {
11861186 .user_data = 0xeeeeeeee,
......@@ -1188,7 +1188,7 @@ test "accept/connect/send/recv" {
11881188 .flags = 0,
11891189 }, cqe_send);
11901190
1191 var cqe_recv = try ring.copy_cqe();
1191 const cqe_recv = try ring.copy_cqe();
11921192 if (cqe_recv.res == -linux.EINVAL) return error.SkipZigTest;
11931193 testing.expectEqual(linux.io_uring_cqe {
11941194 .user_data = 0xffffffff,