ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-27 09:50:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct arena_temp_end usage when no allocation ever happens for that arena

Browse Source
This commit is contained in:
gingerBill
2023-01-28 12:09:24 +00:00
parent 94edf89b20
commit c45ca1bfcc
6 changed files with 623 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/virtual/arena.odin
+19 -17
View File
@@ -311,26 +311,28 @@ arena_temp_end :: proc(temp: Arena_Temp, loc := #caller_location) {
arena := temp.arena
sync.mutex_guard(&arena.mutex)
memory_block_found := false
for block := arena.curr_block; block != nil; block = block.prev {
if block == temp.block {
memory_block_found = true
break
if temp.block != nil {
memory_block_found := false
for block := arena.curr_block; block != nil; block = block.prev {
if block == temp.block {
memory_block_found = true
break
}
}
if !memory_block_found {
assert(arena.curr_block == temp.block, "memory block stored within Arena_Temp not owned by Arena", loc)
}
}
if !memory_block_found {
assert(arena.curr_block == temp.block, "memory block stored within Arena_Temp not owned by Arena", loc)
}
for arena.curr_block != temp.block {
arena_growing_free_last_memory_block(arena)
}
for arena.curr_block != temp.block {
arena_growing_free_last_memory_block(arena)
}
if block := arena.curr_block; block != nil {
assert(block.used >= temp.used, "out of order use of arena_temp_end", loc)
amount_to_zero := min(block.used-temp.used, block.reserved-block.used)
mem.zero_slice(block.base[temp.used:][:amount_to_zero])
block.used = temp.used
if block := arena.curr_block; block != nil {
assert(block.used >= temp.used, "out of order use of arena_temp_end", loc)
amount_to_zero := min(block.used-temp.used, block.reserved-block.used)
mem.zero_slice(block.base[temp.used:][:amount_to_zero])
block.used = temp.used
}
}
assert(arena.temp_count > 0, "double-use of arena_temp_end", loc)
core/runtime/print.odin
+67
View File
@@ -2,6 +2,73 @@ package runtime
_INTEGER_DIGITS :: "0123456789abcdefghijklmnopqrstuvwxyz"
when !ODIN_DISALLOW_RTTI {
print_any_single :: proc(arg: any) {
x := arg
if loc, ok := x.(Source_Code_Location); ok {
print_caller_location(loc)
return
}
x.id = typeid_base(x.id)
switch v in x {
case typeid: print_typeid(v)
case ^Type_Info: print_type(v)
case string: print_string(v)
case cstring: print_string(string(v))
case []byte: print_string(string(v))
case rune: print_rune(v)
case u8: print_u64(u64(v))
case u16: print_u64(u64(v))
case u16le: print_u64(u64(v))
case u16be: print_u64(u64(v))
case u32: print_u64(u64(v))
case u32le: print_u64(u64(v))
case u32be: print_u64(u64(v))
case u64: print_u64(u64(v))
case u64le: print_u64(u64(v))
case u64be: print_u64(u64(v))
case i8: print_i64(i64(v))
case i16: print_i64(i64(v))
case i16le: print_i64(i64(v))
case i16be: print_i64(i64(v))
case i32: print_i64(i64(v))
case i32le: print_i64(i64(v))
case i32be: print_i64(i64(v))
case i64: print_i64(i64(v))
case i64le: print_i64(i64(v))
case i64be: print_i64(i64(v))
case int: print_int(v)
case uint: print_uint(v)
case uintptr: print_uintptr(v)
case:
ti := type_info_of(x.id)
#partial switch v in ti.variant {
case Type_Info_Pointer:
print_uintptr((^uintptr)(x.data)^)
return
}
print_string("<invalid-value>")
}
}
println_any :: proc(args: ..any) {
loop: for arg, i in args {
if i != 0 {
print_string(" ")
}
print_any_single(arg)
}
print_string("\n")
}
}
encode_rune :: proc "contextless" (c: rune) -> ([4]u8, int) {
r := c