mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-09 15:19:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

EventLoop: revert incorrect optimization

Browse source
This commit is contained in:
Jacob Young 2025-03-31 23:45:31 -04:00 • committed by Andrew Kelley
parent fa937d686d
commit f0919a4cea
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/std/Io/EventLoop.zig
View file

@ -248,8 +248,16 @@ fn findReadyFiber(el: *EventLoop, thread: *Thread) ?*Fiber {
if (thread.steal_ready_search_index == active_threads) thread.steal_ready_search_index = 0; if (thread.steal_ready_search_index == active_threads) thread.steal_ready_search_index = 0;
const steal_ready_search_thread = &el.threads.allocated[0..active_threads][thread.steal_ready_search_index]; const steal_ready_search_thread = &el.threads.allocated[0..active_threads][thread.steal_ready_search_index];
if (steal_ready_search_thread == thread) continue; if (steal_ready_search_thread == thread) continue;
const ready_fiber = @atomicRmw(?*Fiber, &steal_ready_search_thread.ready_queue, .And, Fiber.finished, .acquire) orelse continue; const ready_fiber = @atomicLoad(?*Fiber, &steal_ready_search_thread.ready_queue, .acquire) orelse continue;
if (ready_fiber == Fiber.finished) continue; if (ready_fiber == Fiber.finished) continue;
if (@cmpxchgWeak(
?*Fiber,
&steal_ready_search_thread.ready_queue,
ready_fiber,
null,
.acquire,
.monotonic,
)) |_| continue;
@atomicStore(?*Fiber, &thread.ready_queue, ready_fiber.queue_next, .release); @atomicStore(?*Fiber, &thread.ready_queue, ready_fiber.queue_next, .release);
ready_fiber.queue_next = null; ready_fiber.queue_next = null;
return ready_fiber; return ready_fiber;
@ -297,7 +305,7 @@ fn schedule(el: *EventLoop, thread: *Thread, ready_queue: Fiber.Queue) void {
&idle_search_thread.ready_queue, &idle_search_thread.ready_queue,
null, null,
ready_queue.head, ready_queue.head,
.acq_rel, .release,
.monotonic, .monotonic,
)) |_| continue; )) |_| continue;
getSqe(&thread.io_uring).* = .{ getSqe(&thread.io_uring).* = .{
@ -1268,9 +1276,9 @@ fn conditionWait(userdata: ?*anyopaque, cond: *Io.Condition, mutex: *Io.Mutex) I
const fiber = thread.currentFiber(); const fiber = thread.currentFiber();
const prev = @atomicRmw(?*Fiber, cond_state, .Xchg, fiber, .acquire); const prev = @atomicRmw(?*Fiber, cond_state, .Xchg, fiber, .acquire);
assert(prev == null); // More than one wait on same Condition is illegal. assert(prev == null); // More than one wait on same Condition is illegal.
mutex.unlock(io(el)); mutex.unlock(el.io());
el.yield(null, .nothing); el.yield(null, .nothing);
try mutex.lock(io(el)); try mutex.lock(el.io());
} }
fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition) void { fn conditionWake(userdata: ?*anyopaque, cond: *Io.Condition) void {