ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move setting arena backing ot default temp allocator, forgot assert for arena_alloc in default_temp_allocator_arena

Browse Source
This commit is contained in:
ed
2025-01-13 01:33:59 -05:00
parent 106bd8ab80
commit 7e6dde26ad
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
base/runtime/default_temp_allocator_arena.odin
+1
View File
@@ -117,6 +117,7 @@ arena_alloc :: proc(arena: ^Arena, size, alignment: uint, loc := #caller_locatio
// if arena.backing_allocator.procedure == nil { // if arena.backing_allocator.procedure == nil {
// arena.backing_allocator = default_allocator() // arena.backing_allocator = default_allocator()
// } // }
assert(arena.backing_allocator.procedure != nil )
new_block := memory_block_alloc(arena.backing_allocator, block_size, alignment, loc) or_return new_block := memory_block_alloc(arena.backing_allocator, block_size, alignment, loc) or_return
new_block.prev = arena.curr_block new_block.prev = arena.curr_block
base/runtime/default_temporary_allocator.odin
+5
View File
@@ -40,6 +40,11 @@ when NO_DEFAULT_TEMP_ALLOCATOR {
old_memory: rawptr, old_size: int, loc := #caller_location) -> (data: []byte, err: Allocator_Error) { old_memory: rawptr, old_size: int, loc := #caller_location) -> (data: []byte, err: Allocator_Error) {
s := (^Default_Temp_Allocator)(allocator_data) s := (^Default_Temp_Allocator)(allocator_data)
// Note(Ed) - Sectr Fork: The arena_alloc was originally doing this anyway,
// but I'm moving it to here since I want to have it assert if this is not set there.
if s.arena.backing_allocator.procedure == nil {
s.arena.backing_allocator = default_allocator()
}
return arena_allocator_proc(&s.arena, mode, size, alignment, old_memory, old_size, loc) return arena_allocator_proc(&s.arena, mode, size, alignment, old_memory, old_size, loc)
} }