sergeypdev/engine
1
0
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Remove unnecessary special case in BuddyAllocator.free

Browse Source
This commit is contained in:
sergeypdev 2024-07-20 17:53:11 +04:00
parent 2c385c7656
commit a39fdad1a0
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/BuddyAllocator.zig
View File

@ -87,27 +87,22 @@ pub fn alloc(self: *BuddyAllocator, size: usize) !Alloc {
}
pub fn free(self: *BuddyAllocator, allocation: Alloc) void {
if (allocation.depth == 0) {
std.debug.assert(self.states[0] == BlockState.Allocated);
self.states[0] = BlockState.Free;
} else {
const size = self.getDepthSize(@intCast(allocation.depth));
const depth_offset = (@as(usize, @intCast(1)) << allocation.depth) - 1;
const size = self.getDepthSize(@intCast(allocation.depth));
const depth_offset = (@as(usize, @intCast(1)) << allocation.depth) - 1;
const idx = @as(usize, @intCast(allocation.offset)) / size;
const node = idx + depth_offset;
const idx = @as(usize, @intCast(allocation.offset)) / size;
const node = idx + depth_offset;
std.debug.assert(self.states[node] == BlockState.Allocated);
self.states[node] = BlockState.Free;
std.debug.assert(self.states[node] == BlockState.Allocated);
self.states[node] = BlockState.Free;
// Merge
{
var parent = @divFloor(@as(isize, @intCast(node)) - 1, 2);
while (parent >= 0) : (parent = @divFloor(parent - 1, 2)) {
const parent_usize: usize = @intCast(parent);
if (self.states[parent_usize * 2 + 1] == BlockState.Free and self.states[parent_usize * 2 + 2] == BlockState.Free) {
self.states[parent_usize] = BlockState.Free;
}
// Merge
{
var parent = @divFloor(@as(isize, @intCast(node)) - 1, 2);
while (parent >= 0) : (parent = @divFloor(parent - 1, 2)) {
const parent_usize: usize = @intCast(parent);
if (self.states[parent_usize * 2 + 1] == BlockState.Free and self.states[parent_usize * 2 + 2] == BlockState.Free) {
self.states[parent_usize] = BlockState.Free;
}
}
}