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

Improve the Allocator interface to support returning Allocator_Error to allow for safer calls

Browse Source 
Virtually all code (except for user-written custom allocators) should work as normal. Extra features will need to be added to make the current procedures support the `Allocator_Error` return value (akin to #optional_ok)
This commit is contained in:
gingerBill
2021-04-19 12:31:31 +01:00
parent a4d0092b16
commit f98c4d6837
13 changed files with 386 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/runtime/core_builtin.odin
+14 -12
View File
@@ -180,12 +180,14 @@ DEFAULT_RESERVE_CAPACITY :: 16;
make_aligned :: proc($T: typeid/[]$E, auto_cast len: int, alignment: int, allocator := context.allocator, loc := #caller_location) -> T {
make_slice_error_loc(loc, len);
data := mem_alloc(size_of(E)*len, alignment, allocator, loc);
if data == nil && size_of(E) != 0 {
data, err := mem_alloc_bytes(size_of(E)*len, alignment, allocator, loc);
switch {
case err != nil:
return nil;
case data == nil && size_of(E) != 0:
return nil;
}
// mem_zero(data, size_of(E)*len);
s := Raw_Slice{data, len};
s := Raw_Slice{raw_data(data), len};
return transmute(T)s;
}
@@ -449,15 +451,15 @@ reserve_dynamic_array :: proc(array: ^$T/[dynamic]$E, capacity: int, loc := #cal
new_size := capacity * size_of(E);
allocator := a.allocator;
new_data := allocator.procedure(
new_data, err := allocator.procedure(
allocator.data, .Resize, new_size, align_of(E),
a.data, old_size, 0, loc,
a.data, old_size, loc,
);
if new_data == nil {
if new_data == nil || err != nil {
return false;
}
a.data = new_data;
a.data = raw_data(new_data);
a.cap = capacity;
return true;
}
@@ -483,15 +485,15 @@ resize_dynamic_array :: proc(array: ^$T/[dynamic]$E, length: int, loc := #caller
new_size := length * size_of(E);
allocator := a.allocator;
new_data := allocator.procedure(
new_data, err := allocator.procedure(
allocator.data, .Resize, new_size, align_of(E),
a.data, old_size, 0, loc,
a.data, old_size, loc,
);
if new_data == nil {
if new_data == nil || err != nil {
return false;
}
a.data = new_data;
a.data = raw_data(new_data);
a.len = length;
a.cap = length;
return true;