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

Add caller location info to os.read_entire_file()

Browse Source 
This helps people using the mem.Tracking_Allocator to more easily
pinpoint where they leaked memory in their own code, rather than
having the leaks be reported as if they were in the core library
itself.
This commit is contained in:
Daniel
2023-01-27 02:42:16 -05:00
parent 450a602230
commit d23d7cf0f2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/os/os.odin
+5 -5
View File
@@ -93,7 +93,7 @@ file_size_from_path :: proc(path: string) -> i64 {
return length return length
} }
read_entire_file_from_filename :: proc(name: string, allocator := context.allocator) -> (data: []byte, success: bool) { read_entire_file_from_filename :: proc(name: string, allocator := context.allocator, loc := #caller_location) -> (data: []byte, success: bool) {
context.allocator = allocator context.allocator = allocator
fd, err := open(name, O_RDONLY, 0) fd, err := open(name, O_RDONLY, 0)
@@ -102,10 +102,10 @@ read_entire_file_from_filename :: proc(name: string, allocator := context.alloca
} }
defer close(fd) defer close(fd)
return read_entire_file_from_handle(fd, allocator) return read_entire_file_from_handle(fd, allocator, loc)
} }
read_entire_file_from_handle :: proc(fd: Handle, allocator := context.allocator) -> (data: []byte, success: bool) { read_entire_file_from_handle :: proc(fd: Handle, allocator := context.allocator, loc := #caller_location) -> (data: []byte, success: bool) {
context.allocator = allocator context.allocator = allocator
length: i64 length: i64
@@ -118,7 +118,7 @@ read_entire_file_from_handle :: proc(fd: Handle, allocator := context.allocator)
return nil, true return nil, true
} }
data = make([]byte, int(length), allocator) data = make([]byte, int(length), allocator, loc)
if data == nil { if data == nil {
return nil, false return nil, false
} }
@@ -216,7 +216,7 @@ heap_allocator_proc :: proc(allocator_data: rawptr, mode: mem.Allocator_Mode,
} }
new_memory = aligned_alloc(new_size, new_alignment, p) or_return new_memory = aligned_alloc(new_size, new_alignment, p) or_return
// NOTE: heap_resize does not zero the new memory, so we do it // NOTE: heap_resize does not zero the new memory, so we do it
if new_size > old_size { if new_size > old_size {
new_region := mem.raw_data(new_memory[old_size:]) new_region := mem.raw_data(new_memory[old_size:])