mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to sync with master

Browse Source
This commit is contained in:
Andrew Kelley 2025-07-09 22:48:24 -07:00
parent e1cbcecf89
commit fd4dd3befb
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/std/Io/EventLoop.zig
View File

@ -80,7 +80,7 @@ const Fiber = struct {
);
fn allocate(el: *EventLoop) error{OutOfMemory}!*Fiber {
return @ptrCast(try el.gpa.alignedAlloc(u8, @alignOf(Fiber), allocation_size));
return @ptrCast(try el.gpa.alignedAlloc(u8, .of(Fiber), allocation_size));
}
fn allocatedSlice(f: *Fiber) []align(@alignOf(Fiber)) u8 {
@ -138,8 +138,8 @@ pub fn io(el: *EventLoop) Io {
return .{
.userdata = el,
.vtable = &.{
.@"async" = @"async",
.@"await" = @"await",
.async = async,
.await = await,
.go = go,
.select = select,
.cancel = cancel,
@ -166,7 +166,7 @@ pub fn io(el: *EventLoop) Io {
pub fn init(el: *EventLoop, gpa: Allocator) !void {
const threads_size = @max(std.Thread.getCpuCount() catch 1, 1) * @sizeOf(Thread);
const idle_stack_end_offset = std.mem.alignForward(usize, threads_size + idle_stack_size, std.heap.page_size_max);
const allocated_slice = try gpa.alignedAlloc(u8, @alignOf(Thread), idle_stack_end_offset);
const allocated_slice = try gpa.alignedAlloc(u8, .of(Thread), idle_stack_end_offset);
errdefer gpa.free(allocated_slice);
el.* = .{
.gpa = gpa,
@ -697,7 +697,7 @@ const AsyncClosure = struct {
}
};
fn @"async"(
fn async(
userdata: ?*anyopaque,
result: []u8,
result_alignment: Alignment,
@ -835,7 +835,7 @@ fn go(
event_loop.schedule(current_thread, .{ .head = fiber, .tail = fiber });
}
fn @"await"(
fn await(
userdata: ?*anyopaque,
any_future: *std.Io.AnyFuture,
result: []u8,
@ -916,7 +916,7 @@ fn cancel(
.resv = 0,
};
};
@"await"(userdata, any_future, result, result_alignment);
await(userdata, any_future, result, result_alignment);
}
fn cancelRequested(userdata: ?*anyopaque) bool {

8
lib/std/Thread/Pool.zig
View File

@ -330,8 +330,8 @@ pub fn io(pool: *Pool) Io {
return .{
.userdata = pool,
.vtable = &.{
.@"async" = @"async",
.@"await" = @"await",
.async = async,
.await = await,
.go = go,
.cancel = cancel,
.cancelRequested = cancelRequested,
@ -444,7 +444,7 @@ const AsyncClosure = struct {
}
};
fn @"async"(
fn async(
userdata: ?*anyopaque,
result: []u8,
result_alignment: std.mem.Alignment,
@ -560,7 +560,7 @@ fn go(
pool.cond.signal();
}
fn @"await"(
fn await(
userdata: ?*anyopaque,
any_future: *std.Io.AnyFuture,
result: []u8,