authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-03-31 16:25:11-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-10-02 16:30:59-07:00
loge5b2df0c9b84da0daac5166a1b6170ccbf00e0b7
treea7a8875a1f9c82bf2a879370d082999cbd551809
parent63b3a3d11c389a2cf617ed6d1a7b5a6b36991974

std.Io.Condition: change primitive to support only one

and no timer

3 files changed, 37 insertions(+), 80 deletions(-)

lib/std/Io.zig+16-36
...@@ -629,8 +629,8 @@ pub const VTable = struct {...@@ -629,8 +629,8 @@ pub const VTable = struct {
629 mutexLock: *const fn (?*anyopaque, prev_state: Mutex.State, mutex: *Mutex) Cancelable!void,629 mutexLock: *const fn (?*anyopaque, prev_state: Mutex.State, mutex: *Mutex) Cancelable!void,
630 mutexUnlock: *const fn (?*anyopaque, prev_state: Mutex.State, mutex: *Mutex) void,630 mutexUnlock: *const fn (?*anyopaque, prev_state: Mutex.State, mutex: *Mutex) void,
631631
632 conditionWait: *const fn (?*anyopaque, cond: *Condition, mutex: *Mutex, timeout_ns: ?u64) Condition.WaitError!void,632 conditionWait: *const fn (?*anyopaque, cond: *Condition, mutex: *Mutex) Cancelable!void,
633 conditionWake: *const fn (?*anyopaque, cond: *Condition, notify: Condition.Notify) void,633 conditionWake: *const fn (?*anyopaque, cond: *Condition) void,
634634
635 createFile: *const fn (?*anyopaque, dir: fs.Dir, sub_path: []const u8, flags: fs.File.CreateFlags) FileOpenError!fs.File,635 createFile: *const fn (?*anyopaque, dir: fs.Dir, sub_path: []const u8, flags: fs.File.CreateFlags) FileOpenError!fs.File,
636 openFile: *const fn (?*anyopaque, dir: fs.Dir, sub_path: []const u8, flags: fs.File.OpenFlags) FileOpenError!fs.File,636 openFile: *const fn (?*anyopaque, dir: fs.Dir, sub_path: []const u8, flags: fs.File.OpenFlags) FileOpenError!fs.File,
...@@ -642,6 +642,11 @@ pub const VTable = struct {...@@ -642,6 +642,11 @@ pub const VTable = struct {
642 sleep: *const fn (?*anyopaque, clockid: std.posix.clockid_t, deadline: Deadline) SleepError!void,642 sleep: *const fn (?*anyopaque, clockid: std.posix.clockid_t, deadline: Deadline) SleepError!void,
643};643};
644644
645pub const Cancelable = error{
646 /// Caller has requested the async operation to stop.
647 Canceled,
648};
649
645pub const OpenFlags = fs.File.OpenFlags;650pub const OpenFlags = fs.File.OpenFlags;
646pub const CreateFlags = fs.File.CreateFlags;651pub const CreateFlags = fs.File.CreateFlags;
647652
...@@ -795,43 +800,18 @@ pub const Mutex = if (true) struct {...@@ -795,43 +800,18 @@ pub const Mutex = if (true) struct {
795 }800 }
796};801};
797802
803/// Supports exactly 1 waiter. More than 1 simultaneous wait on the same
804/// condition is illegal.
798pub const Condition = struct {805pub const Condition = struct {
799 state: u64 = 0,806 state: u64 = 0,
800807
801 pub const WaitError = error{
802 Timeout,
803 Canceled,
804 };
805
806 /// How many waiters to wake up.
807 pub const Notify = enum {
808 one,
809 all,
810 };
811
812 pub fn wait(cond: *Condition, io: Io, mutex: *Mutex) Cancelable!void {808 pub fn wait(cond: *Condition, io: Io, mutex: *Mutex) Cancelable!void {
813 io.vtable.conditionWait(io.userdata, cond, mutex, null) catch |err| switch (err) {809 return io.vtable.conditionWait(io.userdata, cond, mutex);
814 error.Timeout => unreachable, // no timeout provided so we shouldn't have timed-out
815 error.Canceled => return error.Canceled,
816 };
817 }810 }
818811
819 pub fn timedWait(cond: *Condition, io: Io, mutex: *Mutex, timeout_ns: u64) WaitError!void {812 pub fn wake(cond: *Condition, io: Io) void {
820 return io.vtable.conditionWait(io.userdata, cond, mutex, timeout_ns);813 io.vtable.conditionWake(io.userdata, cond);
821 }814 }
822
823 pub fn signal(cond: *Condition, io: Io) void {
824 io.vtable.conditionWake(io.userdata, cond, .one);
825 }
826
827 pub fn broadcast(cond: *Condition, io: Io) void {
828 io.vtable.conditionWake(io.userdata, cond, .all);
829 }
830};
831
832pub const Cancelable = error{
833 /// Caller has requested the async operation to stop.
834 Canceled,
835};815};
836816
837pub const TypeErasedQueue = struct {817pub const TypeErasedQueue = struct {
...@@ -883,7 +863,7 @@ pub const TypeErasedQueue = struct {...@@ -883,7 +863,7 @@ pub const TypeErasedQueue = struct {
883 remaining = remaining[copy_len..];863 remaining = remaining[copy_len..];
884 getter.data.remaining = getter.data.remaining[copy_len..];864 getter.data.remaining = getter.data.remaining[copy_len..];
885 if (getter.data.remaining.len == 0) {865 if (getter.data.remaining.len == 0) {
886 getter.data.condition.signal(io);866 getter.data.condition.wake(io);
887 continue;867 continue;
888 }868 }
889 q.getters.prepend(getter);869 q.getters.prepend(getter);
...@@ -966,7 +946,7 @@ pub const TypeErasedQueue = struct {...@@ -966,7 +946,7 @@ pub const TypeErasedQueue = struct {
966 putter.data.remaining = putter.data.remaining[copy_len..];946 putter.data.remaining = putter.data.remaining[copy_len..];
967 remaining = remaining[copy_len..];947 remaining = remaining[copy_len..];
968 if (putter.data.remaining.len == 0) {948 if (putter.data.remaining.len == 0) {
969 putter.data.condition.signal(io);949 putter.data.condition.wake(io);
970 } else {950 } else {
971 assert(remaining.len == 0);951 assert(remaining.len == 0);
972 q.putters.prepend(putter);952 q.putters.prepend(putter);
...@@ -999,7 +979,7 @@ pub const TypeErasedQueue = struct {...@@ -999,7 +979,7 @@ pub const TypeErasedQueue = struct {
999 putter.data.remaining = putter.data.remaining[copy_len..];979 putter.data.remaining = putter.data.remaining[copy_len..];
1000 q.put_index += copy_len;980 q.put_index += copy_len;
1001 if (putter.data.remaining.len == 0) {981 if (putter.data.remaining.len == 0) {
1002 putter.data.condition.signal(io);982 putter.data.condition.wake(io);
1003 continue;983 continue;
1004 }984 }
1005 const second_available = q.buffer[0..q.get_index];985 const second_available = q.buffer[0..q.get_index];
...@@ -1008,7 +988,7 @@ pub const TypeErasedQueue = struct {...@@ -1008,7 +988,7 @@ pub const TypeErasedQueue = struct {
1008 putter.data.remaining = putter.data.remaining[copy_len..];988 putter.data.remaining = putter.data.remaining[copy_len..];
1009 q.put_index = copy_len;989 q.put_index = copy_len;
1010 if (putter.data.remaining.len == 0) {990 if (putter.data.remaining.len == 0) {
1011 putter.data.condition.signal(io);991 putter.data.condition.wake(io);
1012 continue;992 continue;
1013 }993 }
1014 q.putters.prepend(putter);994 q.putters.prepend(putter);
lib/std/Io/EventLoop.zig+16-17
...@@ -781,7 +781,6 @@ fn go(...@@ -781,7 +781,6 @@ fn go(
781 event_loop.schedule(current_thread, .{ .head = fiber, .tail = fiber });781 event_loop.schedule(current_thread, .{ .head = fiber, .tail = fiber });
782}782}
783783
784
785fn @"await"(784fn @"await"(
786 userdata: ?*anyopaque,785 userdata: ?*anyopaque,
787 any_future: *std.Io.AnyFuture,786 any_future: *std.Io.AnyFuture,
...@@ -1277,24 +1276,24 @@ fn mutexUnlock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mut...@@ -1277,24 +1276,24 @@ fn mutexUnlock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mut
1277 el.yield(maybe_waiting_fiber.?, .reschedule);1276 el.yield(maybe_waiting_fiber.?, .reschedule);
1278}1277}
12791278
1280fn conditionWait(1279fn conditionWait(userdata: ?*anyopaque, cond: *Io.Condition, mutex: *Io.Mutex) Io.Cancelable!void {
1281 userdata: ?*anyopaque,1280 const el: *EventLoop = @alignCast(@ptrCast(userdata));
1282 cond: *Io.Condition,1281 const cond_state: *?*Fiber = @ptrCast(&cond.state);
1283 mutex: *Io.Mutex,1282 const thread: *Thread = .current();
1284 timeout: ?u64,1283 const fiber = thread.currentFiber();
1285) Io.Condition.WaitError!void {1284 const prev = @atomicRmw(?*Fiber, cond_state, .Xchg, fiber, .acquire);
1286 _ = userdata;1285 assert(prev == null); // More than one wait on same Condition is illegal.
1287 _ = cond;1286 mutex.unlock(io(el));
1288 _ = mutex;1287 el.yield(null, .nothing);
1289 _ = timeout;1288 try mutex.lock(io(el));
1290 @panic("TODO");
1291}1289}
12921290
1293fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition, notify: Io.Condition.Notify) void {1291fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition) void {
1294 _ = userdata;1292 const el: *EventLoop = @alignCast(@ptrCast(userdata));
1295 _ = cond;1293 const cond_state: *?*Fiber = @ptrCast(&cond.state);
1296 _ = notify;1294 if (@atomicRmw(?*Fiber, cond_state, .Xchg, null, .acquire)) |fiber| {
1297 @panic("TODO");1295 el.yield(fiber, .reschedule);
1296 }
1298}1297}
12991298
1300fn errno(signed: i32) std.os.linux.E {1299fn errno(signed: i32) std.os.linux.E {
lib/std/Thread/Pool.zig+5-27
...@@ -619,12 +619,7 @@ fn mutexUnlock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mut...@@ -619,12 +619,7 @@ fn mutexUnlock(userdata: ?*anyopaque, prev_state: Io.Mutex.State, mutex: *Io.Mut
619 }619 }
620}620}
621621
622fn conditionWait(622fn conditionWait(userdata: ?*anyopaque, cond: *Io.Condition, mutex: *Io.Mutex) Io.Cancelable!void {
623 userdata: ?*anyopaque,
624 cond: *Io.Condition,
625 mutex: *Io.Mutex,
626 timeout: ?u64,
627) Io.Condition.WaitError!void {
628 const pool: *std.Thread.Pool = @alignCast(@ptrCast(userdata));623 const pool: *std.Thread.Pool = @alignCast(@ptrCast(userdata));
629 comptime assert(@TypeOf(cond.state) == u64);624 comptime assert(@TypeOf(cond.state) == u64);
630 const ints: *[2]std.atomic.Value(u32) = @ptrCast(&cond.state);625 const ints: *[2]std.atomic.Value(u32) = @ptrCast(&cond.state);
...@@ -652,25 +647,11 @@ fn conditionWait(...@@ -652,25 +647,11 @@ fn conditionWait(
652 mutex.unlock(pool.io());647 mutex.unlock(pool.io());
653 defer mutex.lock(pool.io()) catch @panic("TODO");648 defer mutex.lock(pool.io()) catch @panic("TODO");
654649
655 var futex_deadline = std.Thread.Futex.Deadline.init(timeout);650 var futex_deadline = std.Thread.Futex.Deadline.init(null);
656651
657 while (true) {652 while (true) {
658 futex_deadline.wait(cond_epoch, epoch) catch |err| switch (err) {653 futex_deadline.wait(cond_epoch, epoch) catch |err| switch (err) {
659 // On timeout, we must decrement the waiter we added above.654 error.Timeout => unreachable,
660 error.Timeout => {
661 while (true) {
662 // If there's a signal when we're timing out, consume it and report being woken up instead.
663 // Acquire barrier ensures code before the wake() which added the signal happens before we decrement it and return.
664 while (state & signal_mask != 0) {
665 const new_state = state - one_waiter - one_signal;
666 state = cond_state.cmpxchgWeak(state, new_state, .acquire, .monotonic) orelse return;
667 }
668
669 // Remove the waiter we added and officially return timed out.
670 const new_state = state - one_waiter;
671 state = cond_state.cmpxchgWeak(state, new_state, .monotonic, .monotonic) orelse return err;
672 }
673 },
674 };655 };
675656
676 epoch = cond_epoch.load(.acquire);657 epoch = cond_epoch.load(.acquire);
...@@ -685,7 +666,7 @@ fn conditionWait(...@@ -685,7 +666,7 @@ fn conditionWait(
685 }666 }
686}667}
687668
688fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition, notify: Io.Condition.Notify) void {669fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition) void {
689 const pool: *std.Thread.Pool = @alignCast(@ptrCast(userdata));670 const pool: *std.Thread.Pool = @alignCast(@ptrCast(userdata));
690 _ = pool;671 _ = pool;
691 comptime assert(@TypeOf(cond.state) == u64);672 comptime assert(@TypeOf(cond.state) == u64);
...@@ -709,10 +690,7 @@ fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition, notify: Io.Conditio...@@ -709,10 +690,7 @@ fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition, notify: Io.Conditio
709 return;690 return;
710 }691 }
711692
712 const to_wake = switch (notify) {693 const to_wake = 1;
713 .one => 1,
714 .all => wakeable,
715 };
716694
717 // Reserve the amount of waiters to wake by incrementing the signals count.695 // Reserve the amount of waiters to wake by incrementing the signals count.
718 // Release barrier ensures code before the wake() happens before the signal it posted and consumed by the wait() threads.696 // Release barrier ensures code before the wake() happens before the signal it posted and consumed by the wait() threads.