authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-28 18:13:49-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-29 06:20:52-07:00
loga45cafb7f0d182be9d2652229583297e55eac5c1
tree871375801e207e4954a1f1b974535fe8ac43b645
parentc40204a3e521b82094fb44b2ce412f47d05964b2

std.Io: add unit test for select

2 files changed, 46 insertions(+), 19 deletions(-)

lib/std/Io.zig+2-2
......@@ -1632,7 +1632,7 @@ pub fn SelectUnion(S: type) type {
16321632
16331633/// `s` is a struct with every field a `*Future(T)`, where `T` can be any type,
16341634/// and can be different for each field.
1635pub fn select(io: Io, s: anytype) SelectUnion(@TypeOf(s)) {
1635pub fn select(io: Io, s: anytype) Cancelable!SelectUnion(@TypeOf(s)) {
16361636 const U = SelectUnion(@TypeOf(s));
16371637 const S = @TypeOf(s);
16381638 const fields = @typeInfo(S).@"struct".fields;
......@@ -1641,7 +1641,7 @@ pub fn select(io: Io, s: anytype) SelectUnion(@TypeOf(s)) {
16411641 const future = @field(s, field.name);
16421642 any_future.* = future.any_future orelse return @unionInit(U, field.name, future.result);
16431643 }
1644 switch (io.vtable.select(io.userdata, &futures)) {
1644 switch (try io.vtable.select(io.userdata, &futures)) {
16451645 inline 0...(fields.len - 1) => |selected_index| {
16461646 const field_name = fields[selected_index].name;
16471647 return @unionInit(U, field_name, @field(s, field_name).await(io));
lib/std/Io/test.zig+44-17
......@@ -3,24 +3,26 @@ const native_endian = builtin.cpu.arch.endian();
33
44const std = @import("std");
55const Io = std.Io;
6const DefaultPrng = std.Random.DefaultPrng;
6const testing = std.testing;
77const expect = std.testing.expect;
88const expectEqual = std.testing.expectEqual;
99const expectError = std.testing.expectError;
10const DefaultPrng = std.Random.DefaultPrng;
1011const mem = std.mem;
1112const fs = std.fs;
1213const File = std.fs.File;
14const assert = std.debug.assert;
1315
1416const tmpDir = std.testing.tmpDir;
1517
1618test "write a file, read it, then delete it" {
17 const io = std.testing.io;
19 const io = testing.io;
1820
1921 var tmp = tmpDir(.{});
2022 defer tmp.cleanup();
2123
2224 var data: [1024]u8 = undefined;
23 var prng = DefaultPrng.init(std.testing.random_seed);
25 var prng = DefaultPrng.init(testing.random_seed);
2426 const random = prng.random();
2527 random.bytes(data[0..]);
2628 const tmp_file_name = "temp_test_file.txt";
......@@ -51,8 +53,8 @@ test "write a file, read it, then delete it" {
5153
5254 var file_buffer: [1024]u8 = undefined;
5355 var file_reader = file.reader(io, &file_buffer);
54 const contents = try file_reader.interface.allocRemaining(std.testing.allocator, .limited(2 * 1024));
55 defer std.testing.allocator.free(contents);
56 const contents = try file_reader.interface.allocRemaining(testing.allocator, .limited(2 * 1024));
57 defer testing.allocator.free(contents);
5658
5759 try expect(mem.eql(u8, contents[0.."begin".len], "begin"));
5860 try expect(mem.eql(u8, contents["begin".len .. contents.len - "end".len], &data));
......@@ -94,18 +96,18 @@ test "setEndPos" {
9496 defer file.close();
9597
9698 // Verify that the file size changes and the file offset is not moved
97 try std.testing.expect((try file.getEndPos()) == 0);
98 try std.testing.expect((try file.getPos()) == 0);
99 try expect((try file.getEndPos()) == 0);
100 try expect((try file.getPos()) == 0);
99101 try file.setEndPos(8192);
100 try std.testing.expect((try file.getEndPos()) == 8192);
101 try std.testing.expect((try file.getPos()) == 0);
102 try expect((try file.getEndPos()) == 8192);
103 try expect((try file.getPos()) == 0);
102104 try file.seekTo(100);
103105 try file.setEndPos(4096);
104 try std.testing.expect((try file.getEndPos()) == 4096);
105 try std.testing.expect((try file.getPos()) == 100);
106 try expect((try file.getEndPos()) == 4096);
107 try expect((try file.getPos()) == 100);
106108 try file.setEndPos(0);
107 try std.testing.expect((try file.getEndPos()) == 0);
108 try std.testing.expect((try file.getPos()) == 100);
109 try expect((try file.getEndPos()) == 0);
110 try expect((try file.getPos()) == 100);
109111}
110112
111113test "updateTimes" {
......@@ -128,7 +130,7 @@ test "updateTimes" {
128130}
129131
130132test "Group" {
131 const io = std.testing.io;
133 const io = testing.io;
132134
133135 var group: Io.Group = .init;
134136 var results: [2]usize = undefined;
......@@ -138,7 +140,7 @@ test "Group" {
138140
139141 group.wait(io);
140142
141 try std.testing.expectEqualSlices(usize, &.{ 45, 245 }, &results);
143 try testing.expectEqualSlices(usize, &.{ 45, 245 }, &results);
142144}
143145
144146fn count(a: usize, b: usize, result: *usize) void {
......@@ -150,7 +152,7 @@ fn count(a: usize, b: usize, result: *usize) void {
150152}
151153
152154test "Group cancellation" {
153 const io = std.testing.io;
155 const io = testing.io;
154156
155157 var group: Io.Group = .init;
156158 var results: [2]usize = undefined;
......@@ -160,7 +162,7 @@ test "Group cancellation" {
160162
161163 group.cancel(io);
162164
163 try std.testing.expectEqualSlices(usize, &.{ 1, 1 }, &results);
165 try testing.expectEqualSlices(usize, &.{ 1, 1 }, &results);
164166}
165167
166168fn sleep(io: Io, result: *usize) void {
......@@ -169,3 +171,28 @@ fn sleep(io: Io, result: *usize) void {
169171 io.sleep(.fromMilliseconds(1), .awake) catch {};
170172 result.* = 1;
171173}
174
175test "select" {
176 const io = testing.io;
177
178 var queue: Io.Queue(u8) = .init(&.{});
179
180 var get_a = try io.concurrent(Io.Queue(u8).getOne, .{ &queue, io });
181 defer if (get_a.cancel(io)) |_| @panic("fail") else |err| assert(err == error.Canceled);
182
183 var get_b = try io.concurrent(Io.Queue(u8).getOne, .{ &queue, io });
184 defer if (get_b.cancel(io)) |_| @panic("fail") else |err| assert(err == error.Canceled);
185
186 var timeout = io.async(Io.sleep, .{ io, .fromMilliseconds(1), .awake });
187 defer timeout.cancel(io) catch {};
188
189 switch (try io.select(.{
190 .get_a = &get_a,
191 .get_b = &get_b,
192 .timeout = &timeout,
193 })) {
194 .get_a => return error.TestFailure,
195 .get_b => return error.TestFailure,
196 .timeout => {},
197 }
198}