Remove Allocator functions from Arena
This commit is contained in:
parent
05bfa73509
commit
e206b4f4a6
@ -2,7 +2,6 @@
|
||||
#define MEM_ARENA_H
|
||||
|
||||
#include "aliases.h"
|
||||
#include "mem_allocator.h"
|
||||
#include <stdbool.h>
|
||||
|
||||
#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);
|
||||
|
@ -1,8 +1,6 @@
|
||||
#include "mem_arena.h"
|
||||
#include "aliases.h"
|
||||
#include "mem_allocator.h"
|
||||
#include "mem_utils.h"
|
||||
#include <math.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user