authorgravatar for joran@ronomon.comJoran Dirk Greef <joran@ronomon.com> 2020-09-19 14:29:23+02:00
committergravatar for joran@ronomon.comJoran Dirk Greef <joran@ronomon.com> 2020-09-19 14:29:23+02:00
log5df0d284d05c5aeb4b721d124b55f40031d93f88
tree85a3b4c9a875ff3ee2af969fae8a0f8a3b0226fc
parentee5931908e9c23403146b18dd3020d57fd3ea10e

Do not register /dev/zero as an fd when testing queue_readv()

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

lib/std/io_uring.zig+1-10
...@@ -740,17 +740,10 @@ test "queue_readv" {...@@ -740,17 +740,10 @@ test "queue_readv" {
740740
741 const fd = try os.openZ("/dev/zero", os.O_RDONLY | os.O_CLOEXEC, 0);741 const fd = try os.openZ("/dev/zero", os.O_RDONLY | os.O_CLOEXEC, 0);
742 defer os.close(fd);742 defer os.close(fd);
743
744 var registered_fds = [_]i32{-1} ** 10;
745 const fd_index = 9;
746 registered_fds[fd_index] = fd;
747 try ring.register_files(registered_fds[0..]);
748743
749 var buffer = [_]u8{42} ** 128;744 var buffer = [_]u8{42} ** 128;
750 var iovecs = [_]os.iovec{ os.iovec { .iov_base = &buffer, .iov_len = buffer.len } };745 var iovecs = [_]os.iovec{ os.iovec { .iov_base = &buffer, .iov_len = buffer.len } };
751 var sqe = try ring.queue_readv(0xcccccccc, fd_index, iovecs[0..], 0);746 var sqe = try ring.queue_readv(0xcccccccc, fd, iovecs[0..], 0);
752 ring.use_registered_fd(sqe);
753 testing.expectEqual(@as(u8, linux.IOSQE_FIXED_FILE), sqe.flags);
754747
755 testing.expectError(error.IO_UringSubmissionQueueFull, ring.queue_nop(0));748 testing.expectError(error.IO_UringSubmissionQueueFull, ring.queue_nop(0));
756 testing.expectEqual(@as(u32, 1), try ring.submit());749 testing.expectEqual(@as(u32, 1), try ring.submit());
...@@ -760,8 +753,6 @@ test "queue_readv" {...@@ -760,8 +753,6 @@ test "queue_readv" {
760 .flags = 0,753 .flags = 0,
761 }, try ring.copy_cqe());754 }, try ring.copy_cqe());
762 testing.expectEqualSlices(u8, &([_]u8{0} ** buffer.len), buffer[0..]);755 testing.expectEqualSlices(u8, &([_]u8{0} ** buffer.len), buffer[0..]);
763
764 try ring.unregister_files();
765}756}
766757
767test "queue_writev/queue_fsync" {758test "queue_writev/queue_fsync" {