Fix bug in memory allocation function

src/common/mem_utils/mem_utils.c

@@ -75,7 +75,7 @@ void *wapp_mem_util_alloc(void *addr, u64 size, MemAccess access,
 #elif defined(WAPP_PLATFORM_POSIX)
   void *output = alloc_posix(addr, size, access, flags);
 #else
-  return NULL;
+#error "Unrecognised platform"
 #endif
 
   if (type == WAPP_MEM_INIT_INITIALISED) {

src/common/misc/misc_utils.h

@@ -3,6 +3,11 @@
 
 #include "aliases.h"
 
+#define KB(SIZE) (SIZE * 1024ull)
+#define MB(SIZE) (KB(SIZE) * 1024)
+#define GB(SIZE) (MB(SIZE) * 1024)
+#define TB(SIZE) (GB(SIZE) * 1024)
+
 #define wapp_misc_utils_padding_size(SIZE)                                     \
   u8 reserved_padding[sizeof(void *) - ((SIZE) % sizeof(void *))]
 

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 <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -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;
   }

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);

tests/arena/test_arena.c

@@ -1,6 +1,7 @@
 #include "test_arena.h"
 #include "aliases.h"
 #include "mem_arena.h"
+#include "misc_utils.h"
 #include "tester.h"
 #include <stdbool.h>
 #include <stdlib.h>
@@ -12,16 +13,15 @@ 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);
 }
 
 TestFuncResult test_arena_init_succeeds_when_reserving_very_large_size(void) {
   Arena *large_arena = NULL;
-  u64 capacity = 512ull * 1024ull * 1024ull * 1024ull;
-  bool result = wapp_mem_arena_init(&large_arena, capacity,
-                                    WAPP_MEM_ALLOC_RESERVE, false);
+  u64 capacity = GB(512);
+  bool result = wapp_mem_arena_init(&large_arena, capacity);
   if (result) {
     wapp_mem_arena_destroy(&large_arena);
   }