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

Merge pull request #3025 from laytan/log-allocator-memory-format

Browse Source 
log allocator: use %m to format size and fix formatting bugs
This commit is contained in:
Jeroen van Rijn
2023-12-16 01:32:18 +01:00
committed by GitHub
parent d47a403d29 58ff3dd1ed
commit d4df3f6383
1 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/log/log_allocator.odin
+38 -29
View File
@@ -2,18 +2,26 @@ package log
import "core:runtime" import "core:runtime"
Log_Allocator_Format :: enum {
Bytes, // Actual number of bytes.
Human, // Bytes in human units like bytes, kibibytes, etc. as appropriate.
}
Log_Allocator :: struct { Log_Allocator :: struct {
allocator: runtime.Allocator, allocator: runtime.Allocator,
level: Level, level: Level,
prefix: string, prefix: string,
locked: bool, locked: bool,
size_fmt: Log_Allocator_Format,
} }
log_allocator_init :: proc(la: ^Log_Allocator, level: Level, allocator := context.allocator, prefix := "") { log_allocator_init :: proc(la: ^Log_Allocator, level: Level, size_fmt := Log_Allocator_Format.Bytes,
allocator := context.allocator, prefix := "") {
la.allocator = allocator la.allocator = allocator
la.level = level la.level = level
la.prefix = prefix la.prefix = prefix
la.locked = false la.locked = false
la.size_fmt = size_fmt
} }
@@ -37,27 +45,27 @@ log_allocator_proc :: proc(allocator_data: rawptr, mode: runtime.Allocator_Mode,
switch mode { switch mode {
case .Alloc: case .Alloc:
logf( fmt: string
la.level, switch la.size_fmt {
"%s%s>>> ALLOCATOR(mode=.Alloc, size=%d, alignment=%d)", case .Bytes: fmt = "%s%s>>> ALLOCATOR(mode=.Alloc, size=%d, alignment=%d)"
la.prefix, padding, size, alignment, case .Human: fmt = "%s%s>>> ALLOCATOR(mode=.Alloc, size=%m, alignment=%d)"
location = location, }
) logf(la.level, fmt, la.prefix, padding, size, alignment, location = location)
case .Alloc_Non_Zeroed: case .Alloc_Non_Zeroed:
logf( fmt: string
la.level, switch la.size_fmt {
"%s%s>>> ALLOCATOR(mode=.Alloc_Non_Zeroed, size=%d, alignment=%d)", case .Bytes: fmt = "%s%s>>> ALLOCATOR(mode=.Alloc_Non_Zeroed, size=%d, alignment=%d)"
la.prefix, padding, size, alignment, case .Human: fmt = "%s%s>>> ALLOCATOR(mode=.Alloc_Non_Zeroed, size=%m, alignment=%d)"
location = location, }
) logf(la.level, fmt, la.prefix, padding, size, alignment, location = location)
case .Free: case .Free:
if old_size != 0 { if old_size != 0 {
logf( fmt: string
la.level, switch la.size_fmt {
"%s%s<<< ALLOCATOR(mode=.Free, ptr=%p, size=%d)", case .Bytes: fmt = "%s%s<<< ALLOCATOR(mode=.Free, ptr=%p, size=%d)"
la.prefix, padding, old_memory, old_size, case .Human: fmt = "%s%s<<< ALLOCATOR(mode=.Free, ptr=%p, size=%m)"
location = location, }
) logf(la.level, fmt, la.prefix, padding, old_memory, old_size, location = location)
} else { } else {
logf( logf(
la.level, la.level,
@@ -74,23 +82,24 @@ log_allocator_proc :: proc(allocator_data: rawptr, mode: runtime.Allocator_Mode,
location = location, location = location,
) )
case .Resize: case .Resize:
logf( fmt: string
la.level, switch la.size_fmt {
"%s%s>>> ALLOCATOR(mode=.Resize, ptr=%p, old_size=%d, size=%d, alignment=%d)", case .Bytes: fmt = "%s%s>>> ALLOCATOR(mode=.Resize, ptr=%p, old_size=%d, size=%d, alignment=%d)"
la.prefix, padding, old_memory, old_size, size, alignment, case .Human: fmt = "%s%s>>> ALLOCATOR(mode=.Resize, ptr=%p, old_size=%m, size=%m, alignment=%d)"
location = location, }
) logf(la.level, fmt, la.prefix, padding, old_memory, old_size, size, alignment, location = location)
case .Query_Features: case .Query_Features:
logf( logf(
la.level, la.level,
"%s%ALLOCATOR(mode=.Query_Features)", "%s%sALLOCATOR(mode=.Query_Features)",
la.prefix, padding, la.prefix, padding,
location = location, location = location,
) )
case .Query_Info: case .Query_Info:
logf( logf(
la.level, la.level,
"%s%ALLOCATOR(mode=.Query_Info)", "%s%sALLOCATOR(mode=.Query_Info)",
la.prefix, padding, la.prefix, padding,
location = location, location = location,
) )
@@ -104,8 +113,8 @@ log_allocator_proc :: proc(allocator_data: rawptr, mode: runtime.Allocator_Mode,
if err != nil { if err != nil {
logf( logf(
la.level, la.level,
"%s%ALLOCATOR ERROR=%v", "%s%sALLOCATOR ERROR=%v",
la.prefix, padding, error, la.prefix, padding, err,
location = location, location = location,
) )
} }