From 775f0864a894c1edac551cd338038b9e435dfcf1 Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Fri, 23 Aug 2024 22:29:56 +0100 Subject: [PATCH] Rename arena default allocation function --- src/core/mem/arena/mem_arena.c | 5 ++--- src/core/mem/arena/mem_arena.h | 23 +++++++++++++---------- tests/arena/test_arena.c | 5 ++--- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/core/mem/arena/mem_arena.c b/src/core/mem/arena/mem_arena.c index ea6cfe1..3158e0e 100644 --- a/src/core/mem/arena/mem_arena.c +++ b/src/core/mem/arena/mem_arena.c @@ -1,7 +1,6 @@ #include "mem_arena.h" #include "aliases.h" #include "mem_utils.h" -#include "misc_utils.h" #include #include #include @@ -27,8 +26,8 @@ struct arena { // PUBLIC API -bool wapp_mem_arena_init(Arena **arena, u64 base_capacity, MemAllocFlags flags, - bool zero_buffer) { +bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, + MemAllocFlags flags, bool zero_buffer) { if (!arena || *arena || base_capacity == 0) { return false; } diff --git a/src/core/mem/arena/mem_arena.h b/src/core/mem/arena/mem_arena.h index 9b75573..ca6c680 100644 --- a/src/core/mem/arena/mem_arena.h +++ b/src/core/mem/arena/mem_arena.h @@ -11,20 +11,23 @@ extern "C" { typedef struct arena Arena; -#define wapp_mem_arena_init_default(arena_dptr, base_capacity) \ - (wapp_mem_arena_init(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, \ - false)) +#define wapp_mem_arena_init(arena_dptr, base_capacity) \ + (wapp_mem_arena_init_custom(arena_dptr, base_capacity, \ + WAPP_MEM_ALLOC_RESERVE, false)) #define wapp_mem_arena_init_commit(arena_dptr, base_capacity) \ - (wapp_mem_arena_init(arena_dptr, base_capacity, \ - WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, false)) + (wapp_mem_arena_init_custom(arena_dptr, base_capacity, \ + WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, \ + false)) #define wapp_mem_arena_init_zero(arena_dptr, base_capacity) \ - (wapp_mem_arena_init(arena_dptr, base_capacity, WAPP_MEM_ALLOC_RESERVE, true)) + (wapp_mem_arena_init_custom(arena_dptr, base_capacity, \ + WAPP_MEM_ALLOC_RESERVE, true)) #define wapp_mem_arena_init_commit_and_zero(arena_dptr, base_capacity) \ - (wapp_mem_arena_init(arena_dptr, base_capacity, \ - WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, true)) + (wapp_mem_arena_init_custom(arena_dptr, base_capacity, \ + WAPP_MEM_ALLOC_RESERVE | WAPP_MEM_ALLOC_COMMIT, \ + true)) -bool wapp_mem_arena_init(Arena **arena, u64 base_capacity, MemAllocFlags flags, - bool zero_buffer); +bool wapp_mem_arena_init_custom(Arena **arena, u64 base_capacity, + MemAllocFlags flags, bool zero_buffer); void *wapp_mem_arena_alloc(Arena *arena, u64 size); void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment); void wapp_mem_arena_clear(Arena *arena); diff --git a/tests/arena/test_arena.c b/tests/arena/test_arena.c index edb288d..dd261da 100644 --- a/tests/arena/test_arena.c +++ b/tests/arena/test_arena.c @@ -13,7 +13,7 @@ internal i32 count = 20; internal i32 *array = NULL; TestFuncResult test_arena_init(void) { - bool result = wapp_mem_arena_init_default(&arena, ARENA_CAPACITY); + bool result = wapp_mem_arena_init(&arena, ARENA_CAPACITY); return wapp_tester_result(result); } @@ -21,8 +21,7 @@ TestFuncResult test_arena_init(void) { TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) { Arena *large_arena = NULL; u64 capacity = GB(512); - bool result = wapp_mem_arena_init(&large_arena, capacity, - WAPP_MEM_ALLOC_RESERVE, false); + bool result = wapp_mem_arena_init(&large_arena, capacity); if (result) { wapp_mem_arena_destroy(&large_arena); }