ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-19 04:12:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

[mem]: Initialize scratch allocator during calls to free and resize

Browse Source
This commit is contained in:
flysand7
2024-09-07 10:24:00 +11:00
parent e5106e48a8
commit 834f082dba
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/allocators.odin
+10 -8
View File
@@ -261,6 +261,9 @@ scratch_allocator_free :: proc(s: ^Scratch_Allocator, ptr: rawptr, loc := #calle
}
scratch_allocator_free_all :: proc(s: ^Scratch_Allocator, loc := #caller_location) {
if s.data == nil {
panic("free_all called on an unitialized scratch allocator", loc)
}
s.curr_offset = 0
s.prev_allocation = nil
for ptr in s.leaked_allocations {
@@ -277,6 +280,13 @@ scratch_allocator_resize_non_zeroed :: proc(
alignment := DEFAULT_ALIGNMENT,
loc := #caller_location
) -> ([]byte, Allocator_Error) {
if s.data == nil {
DEFAULT_BACKING_SIZE :: 4 * Megabyte
if !(context.allocator.procedure != scratch_allocator_proc && context.allocator.data != s) {
panic("cyclic initialization of the scratch allocator with itself", loc)
}
scratch_allocator_init(s, DEFAULT_BACKING_SIZE)
}
begin := uintptr(raw_data(s.data))
end := begin + uintptr(len(s.data))
old_ptr := uintptr(old_memory)
@@ -318,14 +328,6 @@ scratch_allocator_proc :: proc(
loc := #caller_location,
) -> ([]byte, Allocator_Error) {
s := (^Scratch_Allocator)(allocator_data)
if s.data == nil {
DEFAULT_BACKING_SIZE :: 4 * Megabyte
if !(context.allocator.procedure != scratch_allocator_proc &&
context.allocator.data != allocator_data) {
panic("cyclic initialization of the scratch allocator with itself")
}
scratch_allocator_init(s, DEFAULT_BACKING_SIZE)
}
size := size
switch mode {
case .Alloc: