authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-01-27 05:37:40+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-01-27 05:37:40+01:00
logf7df723a9147ccbe2699439477ddc3e05ac59468
treea2bf01fa654726d2eed90dfe4aef167e242597ee
parent2c7d3c8007dcc8e46c91e92e1d2676af87d1fbcc
parentd4d210fb377fdf34dc29dd1bc54d59dd5b94a75e
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

Merge branch 'prefer-io-futex'

1 files changed, 14 insertions(+), 3 deletions(-)

lib/std/Build/WebServer.zig+14-3
......@@ -24,7 +24,7 @@ time_report_update_times: []i64,
2424
2525build_status: std.atomic.Value(abi.BuildStatus),
2626/// When an event occurs which means WebSocket clients should be sent updates, call `notifyUpdate`
27/// to increment this value. Each client thread waits for this increment with `std.Thread.Futex`, so
27/// to increment this value. Each client thread waits for this increment with `Io.futexWaitTimeout`, so
2828/// `notifyUpdate` will wake those threads. Updates are sent on a short interval regardless, so it
2929/// is recommended to only use `notifyUpdate` for changes which the user should see immediately. For
3030/// instance, we do not call `notifyUpdate` when the number of "unique runs" in the fuzzer changes,
......@@ -46,7 +46,7 @@ pub const base_clock: Io.Clock = .awake;
4646/// Thread-safe. Triggers updates to be sent to connected WebSocket clients; see `update_id`.
4747pub fn notifyUpdate(ws: *WebServer) void {
4848 _ = ws.update_id.rmw(.Add, 1, .release);
49 std.Thread.Futex.wake(&ws.update_id, 16);
49 ws.graph.io.futexWake(u32, &ws.update_id.raw, 16);
5050}
5151
5252pub const Options = struct {
......@@ -377,7 +377,18 @@ fn serveWebSocket(ws: *WebServer, sock: *http.Server.WebSocket) !noreturn {
377377 }
378378
379379 prev_time = start_time;
380 std.Thread.Futex.timedWait(&ws.update_id, start_update_id, std.time.ns_per_ms * default_update_interval_ms) catch {};
380
381 const old_cp = io.swapCancelProtection(.blocked);
382 defer _ = io.swapCancelProtection(old_cp);
383 io.futexWaitTimeout(
384 u32,
385 &ws.update_id.raw,
386 start_update_id,
387 .{ .duration = .{
388 .clock = .awake,
389 .raw = .fromMilliseconds(default_update_interval_ms),
390 } },
391 ) catch |err| switch (err) { error.Canceled => unreachable };
381392 }
382393}
383394fn recvWebSocketMessages(ws: *WebServer, sock: *http.Server.WebSocket) void {