aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLee Cannon <leecannon@leecannon.xyz>2021-11-06 00:54:35 +0000
committerLee Cannon <leecannon@leecannon.xyz>2021-11-30 23:32:48 +0000
commitf68cda738ad0d3e9bc0f328befad301d9e23756e (patch)
treea08f43aa38d630a71f0686dc9bda9181454d1a0b /src
parent23866b1f81010277b204d6f3f5db23d020a76400 (diff)
downloadzig-f68cda738ad0d3e9bc0f328befad301d9e23756e.tar.gz
zig-f68cda738ad0d3e9bc0f328befad301d9e23756e.zip
allocgate: split free out from resize
Diffstat (limited to 'src')
-rw-r--r--src/tracy.zig20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/tracy.zig b/src/tracy.zig
index 83e31e5764..064374030f 100644
--- a/src/tracy.zig
+++ b/src/tracy.zig
@@ -155,13 +155,10 @@ pub fn TracyAllocator(comptime name: ?[:0]const u8) type {
}
}
- if (resized_len != 0) {
- // this was a shrink or a resize
- if (name) |n| {
- allocNamed(buf.ptr, resized_len, n);
- } else {
- alloc(buf.ptr, resized_len);
- }
+ if (name) |n| {
+ allocNamed(buf.ptr, resized_len, n);
+ } else {
+ alloc(buf.ptr, resized_len);
}
return resized_len;
@@ -172,6 +169,15 @@ pub fn TracyAllocator(comptime name: ?[:0]const u8) type {
return err;
}
}
+
+ fn freeFn(self: *Self, buf: []u8, buf_align: u29, ret_addr: usize) void {
+ self.parent_allocator.rawFree(buf, buf_align, ret_addr);
+ if (name) |n| {
+ freeNamed(buf.ptr, n);
+ } else {
+ free(buf.ptr);
+ }
+ }
};
}