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

std.heap.ThreadSafeAllocator: update to new Allocator API

Browse source
This commit is contained in:
Andrew Kelley 2025-02-04 23:01:24 -08:00
parent 36e9b0f026
commit 1a6d87d699
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/std/heap.zig
View file

@ -1061,6 +1061,7 @@ test {
_ = ArenaAllocator; _ = ArenaAllocator;
_ = GeneralPurposeAllocator; _ = GeneralPurposeAllocator;
_ = FixedBufferAllocator; _ = FixedBufferAllocator;
_ = ThreadSafeAllocator;
if (builtin.target.isWasm()) { if (builtin.target.isWasm()) {
_ = WasmAllocator; _ = WasmAllocator;
} }

22
lib/std/heap/ThreadSafeAllocator.zig
View file

@ -9,35 +9,45 @@ pub fn allocator(self: *ThreadSafeAllocator) Allocator {
.vtable = &.{ .vtable = &.{
.alloc = alloc, .alloc = alloc,
.resize = resize, .resize = resize,
.remap = remap,
.free = free, .free = free,
}, },
}; };
} }
fn alloc(ctx: *anyopaque, n: usize, log2_ptr_align: u8, ra: usize) ?[*]u8 { fn alloc(ctx: *anyopaque, n: usize, alignment: std.mem.Alignment, ra: usize) ?[*]u8 {
const self: *ThreadSafeAllocator = @ptrCast(@alignCast(ctx)); const self: *ThreadSafeAllocator = @ptrCast(@alignCast(ctx));
self.mutex.lock(); self.mutex.lock();
defer self.mutex.unlock(); defer self.mutex.unlock();
return self.child_allocator.rawAlloc(n, log2_ptr_align, ra); return self.child_allocator.rawAlloc(n, alignment, ra);
} }
fn resize(ctx: *anyopaque, buf: []u8, log2_buf_align: u8, new_len: usize, ret_addr: usize) bool { fn resize(ctx: *anyopaque, buf: []u8, alignment: std.mem.Alignment, new_len: usize, ret_addr: usize) bool {
const self: *ThreadSafeAllocator = @ptrCast(@alignCast(ctx)); const self: *ThreadSafeAllocator = @ptrCast(@alignCast(ctx));
self.mutex.lock(); self.mutex.lock();
defer self.mutex.unlock(); defer self.mutex.unlock();
return self.child_allocator.rawResize(buf, log2_buf_align, new_len, ret_addr); return self.child_allocator.rawResize(buf, alignment, new_len, ret_addr);
} }
fn free(ctx: *anyopaque, buf: []u8, log2_buf_align: u8, ret_addr: usize) void { fn remap(context: *anyopaque, memory: []u8, alignment: std.mem.Alignment, new_len: usize, return_address: usize) ?[*]u8 {
const self: *ThreadSafeAllocator = @ptrCast(@alignCast(context));
self.mutex.lock();
defer self.mutex.unlock();
return self.child_allocator.rawRemap(memory, alignment, new_len, return_address);
}
fn free(ctx: *anyopaque, buf: []u8, alignment: std.mem.Alignment, ret_addr: usize) void {
const self: *ThreadSafeAllocator = @ptrCast(@alignCast(ctx)); const self: *ThreadSafeAllocator = @ptrCast(@alignCast(ctx));
self.mutex.lock(); self.mutex.lock();
defer self.mutex.unlock(); defer self.mutex.unlock();
return self.child_allocator.rawFree(buf, log2_buf_align, ret_addr); return self.child_allocator.rawFree(buf, alignment, ret_addr);
} }
const std = @import("../std.zig"); const std = @import("../std.zig");