diff --git a/lib/std/Io/Threaded.zig b/lib/std/Io/Threaded.zig index 3f47272c12c407947422a9852aa891c0cd85eb9b..60b8758843cfcfd02aca36280d6b9128815ad177 100644 --- a/lib/std/Io/Threaded.zig +++ b/lib/std/Io/Threaded.zig @@ -1337,25 +1337,6 @@ const Thread = struct { return @ptrFromInt(@as(usize, @bitCast(split))); } }; - - /// Same as `Io.Mutex.lock` but avoids the VTable. - fn mutexLock(m: *Io.Mutex) Io.Cancelable!void { - const initial_state = m.state.cmpxchgWeak( - .unlocked, - .locked_once, - .acquire, - .monotonic, - ) orelse { - @branchHint(.likely); - return; - }; - if (initial_state == .contended) { - try Thread.futexWait(@ptrCast(&m.state.raw), @intFromEnum(Io.Mutex.State.contended), null); - } - while (m.state.swap(.contended, .acquire) != .unlocked) { - try Thread.futexWait(@ptrCast(&m.state.raw), @intFromEnum(Io.Mutex.State.contended), null); - } - } }; const Syscall = struct { @@ -18663,7 +18644,7 @@ fn condWait(cond: *Io.Condition, mutex: *Io.Mutex) void { /// Same as `Io.Mutex.lockUncancelable` but avoids the VTable. pub fn mutexLock(m: *Io.Mutex) void { - const initial_state = m.state.cmpxchgWeak( + const initial_state = m.state.cmpxchgStrong( .unlocked, .locked_once, .acquire, diff --git a/lib/std/Progress.zig b/lib/std/Progress.zig index aa9c9f54beb1930ffad0424ed6a4738c0a7caaca..64afcaaf17555794228bb3603859794a09ddfba8 100644 --- a/lib/std/Progress.zig +++ b/lib/std/Progress.zig @@ -450,7 +450,7 @@ pub const Node = struct { const ipc = @atomicLoad(Ipc, ipc_ptr, .monotonic); if (ipc.locked or ipc.valid) continue; const generation = ipc.generation +% 1; - if (@cmpxchgWeak( + if (@cmpxchgStrong( Ipc, ipc_ptr, ipc, @@ -1133,7 +1133,7 @@ fn serialize(io: Io, serialized_buffer: *Serialized.Buffer) !Serialized { const ipc_data = &serialized_buffer.ipc_data[ipc_index.slot]; state: switch (ipc_data.state) { .unused => { - if (@cmpxchgWeak( + if (@cmpxchgStrong( Ipc, ipc, .{ .locked = false, .valid = true, .generation = ipc_index.generation },