Array tests, allocator design changes

arena.c

@@ -22,6 +22,7 @@ MA_API void MA_MemoryCopy(void *dst, void *src, size_t size) {
     #include <stdlib.h>
     #define MA_CMalloc(x) malloc(x)
     #define MA_CFree(x) free(x)
+    #define MA_CRealloc(p, size) realloc(p, size)
 #endif
 
 #ifndef MA_StaticFunc
@@ -94,24 +95,6 @@ MA_StaticFunc size_t MA__AlignLen(MA_Arena *a) {
     return aligned;
 }
 
-MA_API void *MA__BeginPackedArray(MA_Arena *arena, size_t element_size) {
-    MA_ASSERT(arena->memory.data);
-    arena->len = MA__AlignLen(arena);
-    arena->saved_alignment = arena->alignment;
-    arena->alignment = 0;
-    arena->packed_array_begin = arena->len;
-    arena->packed_array_element_size = element_size;
-    void *result = arena->memory.data + arena->len;
-    return result;
-}
-
-MA_API int MA_EndPackedArray(MA_Arena *arena) {
-    arena->alignment = arena->saved_alignment;
-    size_t different = (arena->len - arena->packed_array_begin);
-    int result = (int)((arena->len - arena->packed_array_begin) / arena->packed_array_element_size);
-    return result;
-}
-
 MA_API void MA_SetAlignment(MA_Arena *arena, int alignment) {
     arena->alignment = alignment;
 }
@@ -154,7 +137,6 @@ MA_API void *MA_PushSize(MA_Arena *arena, size_t size) {
 MA_API void MA_InitEx(MA_Arena *a, size_t reserve) {
     a->memory = MV_Reserve(reserve);
     a->alignment = MA_DEFAULT_ALIGNMENT;
-    MA_INIT_HOOK(a);
 }
 
 MA_API void MA_Init(MA_Arena *a) {
@@ -171,7 +153,6 @@ MA_API MA_Arena *MA_Bootstrap(void) {
     MA_Arena bootstrap_arena = {0};
     MA_Arena *arena = MA_PushStruct(&bootstrap_arena, MA_Arena);
     *arena = bootstrap_arena;
-    arena->allocator.obj = arena;
     return arena;
 }
 
@@ -180,7 +161,6 @@ MA_API void MA_InitFromBuffer(MA_Arena *arena, void *buffer, size_t size) {
     arena->memory.commit = size;
     arena->memory.reserve = size;
     arena->alignment = MA_DEFAULT_ALIGNMENT;
-    MA_INIT_HOOK(arena);
 }
 
 MA_API MA_Arena MA_MakeFromBuffer(void *buffer, size_t size) {
@@ -190,6 +170,12 @@ MA_API MA_Arena MA_MakeFromBuffer(void *buffer, size_t size) {
     return arena;
 }
 
+MA_API MA_Arena MA_Create() {
+    MA_Arena arena = {0};
+    MA_Init(&arena);
+    return arena;
+}
+
 MA_API char *MA_PushStringCopy(MA_Arena *arena, char *p, size_t size) {
     char *copy_buffer = (char *)MA_PushSizeNonZeroed(arena, size + 1);
     MA_MemoryCopy(copy_buffer, p, size);
@@ -233,12 +219,12 @@ MA_API void MA_Load(MA_Checkpoint checkpoint) {
 }
 
 MA_API void *M_AllocNonZeroed(M_Allocator allocator, size_t size) {
-    void *p = allocator.p(allocator.obj, M_AllocatorOp_Allocate, NULL, size);
+    void *p = allocator.p(allocator.obj, M_AllocatorOp_Allocate, NULL, size, 0);
     return p;
 }
 
 MA_API void *M_Alloc(M_Allocator allocator, size_t size) {
-    void *p = allocator.p(allocator.obj, M_AllocatorOp_Allocate, NULL, size);
+    void *p = allocator.p(allocator.obj, M_AllocatorOp_Allocate, NULL, size, 0);
     MA_MemoryZero(p, size);
     return p;
 }
@@ -250,10 +236,16 @@ MA_API void *M_AllocCopy(M_Allocator allocator, void *p, size_t size) {
 }
 
 MA_API void M_Dealloc(M_Allocator allocator, void *p) {
-    allocator.p(allocator.obj, M_AllocatorOp_Deallocate, p, 0);
+    allocator.p(allocator.obj, M_AllocatorOp_Deallocate, p, 0, 0);
 }
 
-MA_StaticFunc void *M_ClibAllocatorProc(void *allocator, M_AllocatorOp kind, void *p, size_t size) {
+MA_API void *M_ReallocNonZeroed(M_Allocator allocator, void *p, size_t size, size_t old_size) {
+    void *result = allocator.p(allocator.obj, M_AllocatorOp_Reallocate, p, size, old_size);
+    // @todo: add old_size? because we can't zero
+    return result;
+}
+
+MA_StaticFunc void *M_ClibAllocatorProc(void *allocator, M_AllocatorOp kind, void *p, size_t size, size_t old_size) {
     if (kind == M_AllocatorOp_Allocate) {
         return MA_CMalloc(size);
     }
@@ -263,16 +255,26 @@ MA_StaticFunc void *M_ClibAllocatorProc(void *allocator, M_AllocatorOp kind, voi
         return NULL;
     }
 
+    if (kind == M_AllocatorOp_Reallocate) {
+        return MA_CRealloc(p, size);
+    }
+
     MA_ASSERT("MA_Arena invalid codepath");
     return NULL;
 }
 
-MA_API void *MA_AllocatorProc(M_Allocator allocator, M_AllocatorOp kind, void *p, size_t size) {
+MA_API void *MA_AllocatorProc(void *allocator, M_AllocatorOp kind, void *p, size_t size, size_t old_size) {
     if (kind == M_AllocatorOp_Allocate) {
-        return MA_PushSizeNonZeroed((MA_Arena *)allocator.obj, size);
+        return MA_PushSizeNonZeroed((MA_Arena *)allocator, size);
     }
 
-    if (kind == M_AllocatorOp_Deallocate) {
+    else if (kind == M_AllocatorOp_Reallocate) {
+        void *new_p = MA_PushSizeNonZeroed((MA_Arena *)allocator, size);
+        MA_MemoryCopy(new_p, p, old_size);
+        return new_p;
+    }
+
+    else if (kind == M_AllocatorOp_Deallocate) {
         return NULL;
     }
 
@@ -280,6 +282,35 @@ MA_API void *MA_AllocatorProc(M_Allocator allocator, M_AllocatorOp kind, void *p
     return NULL;
 }
 
+MA_API void *MA_ExclusiveAllocatorProc(void *allocator, M_AllocatorOp kind, void *p, size_t size, size_t old_size) {
+    MA_Arena *arena = (MA_Arena *)allocator;
+    if (kind == M_AllocatorOp_Reallocate) {
+        if (size > arena->len) {
+            size_t size_to_push = size - arena->len;
+            MA_PushSizeNonZeroed(arena, size_to_push);
+            return arena->memory.data;
+        }
+    }
+
+    if (kind == M_AllocatorOp_Deallocate) {
+        MA_DeallocateArena(arena);
+        return NULL;
+    }
+
+    MA_ASSERT("MA_Arena invalid codepath");
+    return NULL;
+}
+
+MA_API M_Allocator MA_GetExclusiveAllocator(MA_Arena *arena) {
+    M_Allocator allocator = {arena, MA_ExclusiveAllocatorProc};
+    return allocator;
+}
+
+MA_API M_Allocator MA_GetAllocator(MA_Arena *arena) {
+    M_Allocator allocator = {arena, MA_AllocatorProc};
+    return allocator;
+}
+
 MA_API M_Allocator M_GetSystemAllocator(void) {
     M_Allocator allocator;
     allocator.obj = 0;