mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

update to sync with master

Browse source
This commit is contained in:
Andrew Kelley 2025-07-09 22:48:24 -07:00
parent 0c0ea7844e
commit fdd59f0fa7
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 { 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 { fn allocatedSlice(f: *Fiber) []align(@alignOf(Fiber)) u8 {
@ -138,8 +138,8 @@ pub fn io(el: *EventLoop) Io {
return .{ return .{
.userdata = el, .userdata = el,
.vtable = &.{ .vtable = &.{
.@"async" = @"async", .async = async,
.@"await" = @"await", .await = await,
.go = go, .go = go,
.select = select, .select = select,
.cancel = cancel, .cancel = cancel,
@ -166,7 +166,7 @@ pub fn io(el: *EventLoop) Io {
pub fn init(el: *EventLoop, gpa: Allocator) !void { pub fn init(el: *EventLoop, gpa: Allocator) !void {
const threads_size = @max(std.Thread.getCpuCount() catch 1, 1) * @sizeOf(Thread); 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 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); errdefer gpa.free(allocated_slice);
el.* = .{ el.* = .{
.gpa = gpa, .gpa = gpa,
@ -697,7 +697,7 @@ const AsyncClosure = struct {
} }
}; };
fn @"async"( fn async(
userdata: ?*anyopaque, userdata: ?*anyopaque,
result: []u8, result: []u8,
result_alignment: Alignment, result_alignment: Alignment,
@ -835,7 +835,7 @@ fn go(
event_loop.schedule(current_thread, .{ .head = fiber, .tail = fiber }); event_loop.schedule(current_thread, .{ .head = fiber, .tail = fiber });
} }
fn @"await"( fn await(
userdata: ?*anyopaque, userdata: ?*anyopaque,
any_future: *std.Io.AnyFuture, any_future: *std.Io.AnyFuture,
result: []u8, result: []u8,
@ -916,7 +916,7 @@ fn cancel(
.resv = 0, .resv = 0,
}; };
}; };
@"await"(userdata, any_future, result, result_alignment); await(userdata, any_future, result, result_alignment);
} }
fn cancelRequested(userdata: ?*anyopaque) bool { fn cancelRequested(userdata: ?*anyopaque) bool {

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

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