From e206b4f4a615fa7d2b948375711d71d32e9f5d48 Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Wed, 24 Apr 2024 23:40:10 +0100 Subject: [PATCH] Remove Allocator functions from Arena --- mem/include/arena/mem_arena.h | 2 -- mem/src/arena/mem_arena.c | 46 ----------------------------------- 2 files changed, 48 deletions(-) diff --git a/mem/include/arena/mem_arena.h b/mem/include/arena/mem_arena.h index 5494ebc..1e39d21 100644 --- a/mem/include/arena/mem_arena.h +++ b/mem/include/arena/mem_arena.h @@ -2,7 +2,6 @@ #define MEM_ARENA_H #include "aliases.h" -#include "mem_allocator.h" #include #ifdef __cplusplus @@ -11,7 +10,6 @@ extern "C" { typedef struct growing_arena Arena; -Allocator wapp_mem_arena_allocator(const Arena *arena); bool wapp_mem_arena_init(Arena **arena, u64 base_capacity); void *wapp_mem_arena_alloc(Arena *arena, u64 size); void *wapp_mem_arena_alloc_aligned(Arena *arena, u64 size, u64 alignment); diff --git a/mem/src/arena/mem_arena.c b/mem/src/arena/mem_arena.c index a2d10ba..1458d44 100644 --- a/mem/src/arena/mem_arena.c +++ b/mem/src/arena/mem_arena.c @@ -1,8 +1,6 @@ #include "mem_arena.h" #include "aliases.h" -#include "mem_allocator.h" #include "mem_utils.h" -#include #include #include #include @@ -52,26 +50,8 @@ internal void base_arena_clear(BaseArena *arena); internal void base_arena_free(BaseArena *arena); internal ArenaAllocHDR *find_alloc_header(BaseArena *arena, void *alloc_ptr); -internal void *mem_arena_alloc(u64 size, void *alloc_obj); -internal void *mem_arena_alloc_aligned(u64 size, u64 alignment, - void *alloc_obj); -internal void *mem_arena_realloc(void *ptr, u64 size, void *alloc_obj); -internal void *mem_arena_realloc_aligned(void *ptr, u64 size, u64 alignment, - void *alloc_obj); - // PUBLIC API -Allocator wapp_mem_arena_allocator(const Arena *arena) { - return (Allocator){ - .obj = (void *)arena, - .alloc = mem_arena_alloc, - .alloc_aligned = mem_arena_alloc_aligned, - .realloc = mem_arena_realloc, - .realloc_aligned = mem_arena_realloc_aligned, - .free = NULL, - }; -} - bool wapp_mem_arena_init(Arena **arena, u64 base_capacity) { if (!arena || *arena || base_capacity == 0) { return false; @@ -378,29 +358,3 @@ internal ArenaAllocHDR *find_alloc_header(BaseArena *arena, void *alloc_ptr) { return NULL; } - -internal void *mem_arena_alloc(u64 size, void *alloc_obj) { - Arena *arena = (Arena *)alloc_obj; - - return wapp_mem_arena_alloc(arena, size); -} - -internal 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); -} - -internal void *mem_arena_realloc(void *ptr, u64 size, void *alloc_obj) { - Arena *arena = (Arena *)alloc_obj; - - return wapp_mem_arena_realloc(arena, ptr, size); -} - -internal void *mem_arena_realloc_aligned(void *ptr, u64 size, u64 alignment, - void *alloc_obj) { - Arena *arena = (Arena *)alloc_obj; - - return wapp_mem_arena_realloc_aligned(arena, ptr, size, alignment); -}