andr3/zls
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed debug allocator to comply with the new API

Browse Source
This commit is contained in:
Alexandros Naskos 2020-08-14 13:53:13 +03:00
parent 0f54b0e860
commit c551dfe65a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/debug_allocator.zig
View File

@ -104,10 +104,10 @@ pub fn deinit(self: *DebugAllocator) void {
self.allocation_strack_addresses.deinit(); self.allocation_strack_addresses.deinit();
} }
fn alloc(allocator: *std.mem.Allocator, len: usize, ptr_align: u29, len_align: u29) error{OutOfMemory}![]u8 { fn alloc(allocator: *std.mem.Allocator, len: usize, ptr_align: u29, len_align: u29, ret_addr: usize) std.mem.Allocator.Error![]u8 {
const self = @fieldParentPtr(DebugAllocator, "allocator", allocator); const self = @fieldParentPtr(DebugAllocator, "allocator", allocator);
const ptr = try self.base_allocator.callAllocFn(len, ptr_align, len_align); const ptr = try self.base_allocator.allocFn(self.base_allocator, len, ptr_align, len_align, ret_addr);
self.info.allocation_stats.addSample(ptr.len); self.info.allocation_stats.addSample(ptr.len);
var stack_addresses = std.mem.zeroes([stack_addresses_size + 2]usize); var stack_addresses = std.mem.zeroes([stack_addresses_size + 2]usize);
@ -131,7 +131,8 @@ fn alloc(allocator: *std.mem.Allocator, len: usize, ptr_align: u29, len_align: u
return ptr; return ptr;
} }
fn resize(allocator: *std.mem.Allocator, old_mem: []u8, new_size: usize, len_align: u29) error{OutOfMemory}!usize { // TODO: Check if this complies with the new allocator interface.
fn resize(allocator: *std.mem.Allocator, old_mem: []u8, buf_align: u29, new_size: usize, len_align: u29, ret_addr: usize) std.mem.Allocator.Error!usize {
const self = @fieldParentPtr(DebugAllocator, "allocator", allocator); const self = @fieldParentPtr(DebugAllocator, "allocator", allocator);
if (old_mem.len == 0) { if (old_mem.len == 0) {
@ -166,7 +167,7 @@ fn resize(allocator: *std.mem.Allocator, old_mem: []u8, new_size: usize, len_ali
self.info.peak_allocated = curr_allocs; self.info.peak_allocated = curr_allocs;
} }
return self.base_allocator.callResizeFn(old_mem, new_size, len_align) catch |e| { return self.base_allocator.resizeFn(self.base_allocator, old_mem, buf_align, new_size, len_align, ret_addr) catch |e| {
return e; return e;
}; };
} }