Reorganise allocators

This commit is contained in:
2024-09-07 20:27:49 +01:00
parent d30eee0cf8
commit 8468bb8e28
9 changed files with 161 additions and 96 deletions

View File

@@ -1,6 +1,5 @@
#include "mem_arena.h"
#include "aliases.h"
#include "mem_allocator.h"
#include "mem_utils.h"
#include <stdbool.h>
#include <stdlib.h>
@@ -25,40 +24,10 @@ struct arena {
#endif // ifdef WAPP_PLATFORM_WINDOWS
};
#pragma region Arena Allocator wrappers declarations
internal inline void *mem_arena_alloc(u64 size, void *alloc_obj);
internal inline void *mem_arena_alloc_aligned(u64 size, u64 alignment,
void *alloc_obj);
#pragma endregion Arena Allocator wrappers declarations
/******************************************************************************
**** Arena API definitions
***************************************************************************///
#pragma region Arena Allocator API definitions
Allocator wapp_mem_arena_allocator_init_custom(u64 base_capacity,
MemAllocFlags flags,
bool zero_buffer) {
Allocator allocator = {0};
bool initialised = wapp_mem_arena_init_custom(
(Arena **)(&allocator.obj), base_capacity, flags, zero_buffer);
if (!initialised) {
return allocator;
}
allocator.alloc = mem_arena_alloc;
allocator.alloc_aligned = mem_arena_alloc_aligned;
return allocator;
}
void wapp_mem_arena_allocator_clear(Allocator *allocator) {
wapp_mem_arena_clear((Arena *)(allocator->obj));
}
void wapp_mem_arena_allocator_destroy(Allocator *allocator) {
wapp_mem_arena_destroy((Arena **)(&(allocator->obj)));
*allocator = (Allocator){0};
}
#pragma endregion Arena Allocator API definitions
#pragma region API definitions
bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity,
MemAllocFlags flags, bool zero_buffer) {
if (!arena || *arena || base_capacity == 0) {
@@ -149,17 +118,5 @@ void wapp_mem_arena_destroy(Arena **arena) {
free(*arena);
*arena = NULL;
}
#pragma endregion API definitions
#pragma region Arena Allocator wrappers definitions
internal inline void *mem_arena_alloc(u64 size, void *alloc_obj) {
Arena *arena = (Arena *)alloc_obj;
return wapp_mem_arena_alloc(arena, size);
}
internal inline void *mem_arena_alloc_aligned(u64 size, u64 alignment,
void *alloc_obj) {
Arena *arena = (Arena *)alloc_obj;
return wapp_mem_arena_alloc_aligned(arena, size, alignment);
}
#pragma endregion Arena Allocator wrappers definitions
///////////////////////////////////////////////////////////////////////////////