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

Improve mem/virtual handling of out of memory on Windows

Browse Source
This commit is contained in:
gingerBill
2022-09-12 17:06:32 +01:00
parent 663b62e45f
commit a35d6a6f8d
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/mem/virtual/virtual.odin
+2 -2
View File
@@ -63,6 +63,7 @@ memory_block_alloc :: proc(committed, reserved: uint, flags: Memory_Block_Flags)
} }
page_size := DEFAULT_PAGE_SIZE page_size := DEFAULT_PAGE_SIZE
assert(mem.is_power_of_two(uintptr(page_size)))
committed := committed committed := committed
committed = clamp(committed, 0, reserved) committed = clamp(committed, 0, reserved)
@@ -82,8 +83,7 @@ memory_block_alloc :: proc(committed, reserved: uint, flags: Memory_Block_Flags)
pmblock := platform_memory_alloc(0, total_size) or_return pmblock := platform_memory_alloc(0, total_size) or_return
pmblock.block.base = ([^]byte)(uintptr(pmblock) + base_offset) pmblock.block.base = ([^]byte)(uintptr(pmblock) + base_offset)
commit_err := platform_memory_commit(pmblock, uint(base_offset) + committed) platform_memory_commit(pmblock, uint(base_offset) + committed) or_return
assert(commit_err == nil)
// Should be zeroed // Should be zeroed
assert(pmblock.block.used == 0) assert(pmblock.block.used == 0)
core/mem/virtual/virtual_windows.odin
+5 -3
View File
@@ -51,6 +51,7 @@ PAGE_TARGETS_INVALID :: 0x40000000
PAGE_TARGETS_NO_UPDATE :: 0x40000000 PAGE_TARGETS_NO_UPDATE :: 0x40000000
ERROR_INVALID_ADDRESS :: 487 ERROR_INVALID_ADDRESS :: 487
ERROR_COMMITMENT_LIMIT :: 1455
@(default_calling_convention="stdcall") @(default_calling_convention="stdcall")
foreign Kernel32 { foreign Kernel32 {
@@ -76,12 +77,13 @@ _commit :: proc "contextless" (data: rawptr, size: uint) -> Allocator_Error {
result := VirtualAlloc(data, size, MEM_COMMIT, PAGE_READWRITE) result := VirtualAlloc(data, size, MEM_COMMIT, PAGE_READWRITE)
if result == nil { if result == nil {
switch err := GetLastError(); err { switch err := GetLastError(); err {
case ERROR_INVALID_ADDRESS: case 0:
return .Invalid_Argument
case ERROR_INVALID_ADDRESS, ERROR_COMMITMENT_LIMIT:
return .Out_Of_Memory return .Out_Of_Memory
} }
// TODO(bill): Handle errors correctly return .Out_Of_Memory
return .Invalid_Argument
} }
return nil return nil
} }