diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2023-01-01 13:10:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-01 13:10:49 +0000 |
| commit | c1384afe2fd705ce075277aa8dc6bc259dc94cdc (patch) | |
| tree | eac021b897fe6525a076264d5545aac6c96cfbb5 /core/runtime | |
| parent | 00823ca88c870d49186dbcaa21c54384c0b9364f (diff) | |
| parent | 547c7bce1b28757415c553830a18d94636cedbf8 (diff) | |
Merge branch 'master' into compiler-improvements-2022-12
Diffstat (limited to 'core/runtime')
| -rw-r--r-- | core/runtime/core.odin | 6 | ||||
| -rw-r--r-- | core/runtime/default_temporary_allocator.odin | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/core/runtime/core.odin b/core/runtime/core.odin index 108609f78..a74bf4285 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -329,6 +329,12 @@ Allocator :: struct { data: rawptr, } +Byte :: 1 +Kilobyte :: 1024 * Byte +Megabyte :: 1024 * Kilobyte +Gigabyte :: 1024 * Megabyte +Terabyte :: 1024 * Gigabyte + // Logging stuff Logger_Level :: enum uint { diff --git a/core/runtime/default_temporary_allocator.odin b/core/runtime/default_temporary_allocator.odin index 176634ff9..b71cd103a 100644 --- a/core/runtime/default_temporary_allocator.odin +++ b/core/runtime/default_temporary_allocator.odin @@ -1,6 +1,6 @@ package runtime -DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE: int : #config(DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, 1<<22) +DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE: int : #config(DEFAULT_TEMP_ALLOCATOR_BACKING_SIZE, 4 * Megabyte) when ODIN_OS == .Freestanding || ODIN_OS == .JS || ODIN_DEFAULT_TO_NIL_ALLOCATOR { @@ -197,4 +197,4 @@ default_temp_allocator :: proc(allocator: ^Default_Temp_Allocator) -> Allocator procedure = default_temp_allocator_proc, data = allocator, } -}
\ No newline at end of file +} |