Skip to content

refactor: migrate to Zig 0.16.0-dev.2676 PriorityQueue API #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GrapeBaBa merged 1 commit into from
Feb 28, 2026
Merged

refactor: migrate to Zig 0.16.0-dev.2676 PriorityQueue API #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/EventClock.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pub fn init(self: *EventClock, allocator: Allocator, config: Config, io_handle:
.allocator = allocator,
.io = io_handle,
.clock = undefined,
.waiters = WaiterQueue.init(allocator, {}),
.waiters = WaiterQueue.initContext({}),
};
self.clock = SlotClock.init(config, TimeSource.fromIo(&self.io)) catch return error.InvalidConfig;
}
Expand Down Expand Up @@ -124,7 +124,8 @@ pub fn deinit(self: *EventClock) void {
self.epoch_snapshot.deinit(self.allocator);
self.slot_listeners.deinit(self.allocator);
self.epoch_listeners.deinit(self.allocator);
self.waiters.deinit();
self.waiters.deinit(self.allocator);
self.* = undefined;
}

// ── Listener API ──
Expand Down Expand Up @@ -310,7 +311,7 @@ pub fn waitForSlot(self: *EventClock, target: Slot) Error!WaitForSlotResult {
self.allocator.destroy(state);
return WaitForSlotResult.immediate(error.Aborted);
}
self.waiters.add(.{ .target = target, .state = state }) catch return error.OutOfMemory;
self.waiters.push(self.allocator, .{ .target = target, .state = state }) catch return error.OutOfMemory;
self.dispatchWaiters(self.clock.current_slot);

return .{
Expand All @@ -329,7 +330,7 @@ pub fn cancelWait(self: *EventClock, result: *WaitForSlotResult) void {
// won't dereference the freed state pointer.
for (self.waiters.items, 0..) |entry, i| {
if (entry.state == state) {
_ = self.waiters.removeIndex(i);
_ = self.waiters.popIndex(i);
break;
}
}
Expand Down Expand Up @@ -395,14 +396,14 @@ fn dispatchWaiters(self: *EventClock, current_slot: ?Slot) void {
const slot = current_slot orelse return;
while (self.waiters.peek()) |head| {
if (head.target > slot) break;
const waiter = self.waiters.remove();
const waiter = self.waiters.pop().?;
waiter.state.aborted = false;
waiter.state.event.set(waiter.state.io);
}
}

fn abortAllWaiters(self: *EventClock) void {
while (self.waiters.removeOrNull()) |waiter| {
while (self.waiters.pop()) |waiter| {
waiter.state.aborted = true;
waiter.state.event.set(waiter.state.io);
}
Expand Down
8 changes: 6 additions & 2 deletions src/SlotClock.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ pub const AdvanceIterator = struct {
// Check epoch boundary — epochAtSlot returns ?Epoch
const prev_epoch = slot_math.epochAtSlot(self.clock.config, cur);
const new_epoch = slot_math.epochAtSlot(self.clock.config, next_slot);
if (prev_epoch != null and new_epoch != null and prev_epoch.? < new_epoch.?) {
self.pending_epoch = new_epoch.?;
if (prev_epoch) |prev_ep| {
if (new_epoch) |new_ep| {
if (prev_ep < new_ep) {
self.pending_epoch = new_ep;
}
}
}

return .{ .slot = next_slot };
Expand Down