mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2025-12-30 18:02:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up minimum_block_size default implicit initialization

Browse Source
This commit is contained in:
gingerBill
2022-10-12 21:20:31 +01:00
parent 5a8fbc230d
commit 765cd66b30
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/mem/virtual/arena.odin
View File

@@ -56,7 +56,9 @@ arena_alloc :: proc(arena: ^Arena, size: uint, alignment: uint, loc := #caller_l
case .Growing:
if arena.curr_block == nil || arena.curr_block.used + size > arena.curr_block.reserved {
size = mem.align_forward_uint(size, alignment)
arena.minimum_block_size = max(GROWING_ARENA_DEFAULT_MINIMUM_BLOCK_SIZE, arena.minimum_block_size)
if arena.minimum_block_size == 0 {
arena.minimum_block_size = GROWING_ARENA_DEFAULT_MINIMUM_BLOCK_SIZE
}
block_size := max(size, arena.minimum_block_size)
@@ -71,8 +73,10 @@ arena_alloc :: proc(arena: ^Arena, size: uint, alignment: uint, loc := #caller_l
arena.total_used += arena.curr_block.used - prev_used
case .Static:
if arena.curr_block == nil {
reserve_size := max(arena.minimum_block_size, STATIC_ARENA_DEFAULT_RESERVE_SIZE)
arena_init_static(arena, reserve_size, STATIC_ARENA_DEFAULT_COMMIT_SIZE) or_return
if arena.minimum_block_size == 0 {
arena.minimum_block_size = STATIC_ARENA_DEFAULT_RESERVE_SIZE
}
arena_init_static(arena=arena, reserved=arena.minimum_block_size, commit_size=STATIC_ARENA_DEFAULT_COMMIT_SIZE) or_return
}
data, err = alloc_from_memory_block(arena.curr_block, size, alignment)
arena.total_used = arena.curr_block.used