refactor: arena uses Allocator

This commit is contained in:
2026-06-06 09:48:18 -06:00
parent f3a5ecf807
commit 2dcef95b2e
4 changed files with 101 additions and 83 deletions

View File

@@ -1,90 +1,106 @@
#include <cmocka.h>
#include <limits.h>
#include <setjmp.h>
#include <stdalign.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
#include <setjmp.h>
#include <cmocka.h>
#include <string.h>
#include <limits.h>
#include "lae_allocator.h"
#include "lae_arena.h"
static void test_push_3_ints(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, sizeof(int) * 3), ARENA_OK);
assert_uint_equal(
arena_init(&arena, allocator_default(), sizeof(int) * 3),
ARENA_OK);
int int_to_push = 20;
ArenaPointer result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
ArenaPointer result =
arena_push_data(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid);
assert_int_equal(20, *(int*)arena_unwrap_pointer(result));
assert_int_equal(20, *(int*)arena_unwrap_pointer(result));
assert_int_equal(20, *(int *)arena_unwrap_pointer(result));
assert_int_equal(20, *(int *)arena_unwrap_pointer(result));
int_to_push = 30;
result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
result = arena_push_data(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid);
assert_int_equal(30, *(int*)arena_unwrap_pointer(result));
assert_int_equal(30, *(int *)arena_unwrap_pointer(result));
int_to_push = 40;
result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
result = arena_push_data(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid);
assert_int_equal(40, *(int*)arena_unwrap_pointer(result));
assert_int_equal(40, *(int *)arena_unwrap_pointer(result));
arena_destroy(&arena);
}
static void test_push_3_ints_2_doubles(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(
arena_init(&arena, (sizeof(int) * 3) + (sizeof(double) * 2)),
ARENA_OK
);
arena_init(
&arena,
allocator_default(),
(sizeof(int) * 3) + (sizeof(double) * 2)),
ARENA_OK);
int int_to_push = 20;
ArenaPointer result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
ArenaPointer result =
arena_push_data(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid);
assert_int_equal(20, *(int*)arena_unwrap_pointer(result));
assert_int_equal(20, *(int *)arena_unwrap_pointer(result));
double double_to_push = 4.57;
result = arena_push(arena, &double_to_push, sizeof(double), alignof(double));
result = arena_push_data(
arena,
&double_to_push,
sizeof(double),
alignof(double));
assert_true(result.is_valid);
assert_double_equal(4.57, *(double*)arena_unwrap_pointer(result), 1e-6);
assert_double_equal(4.57, *(double *)arena_unwrap_pointer(result), 1e-6);
int_to_push = 30;
result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
result = arena_push_data(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid);
assert_int_equal(30, *(int*)arena_unwrap_pointer(result));
assert_int_equal(30, *(int *)arena_unwrap_pointer(result));
int_to_push = 40;
result = arena_push(arena, &int_to_push, sizeof(int), alignof(int));
result = arena_push_data(arena, &int_to_push, sizeof(int), alignof(int));
assert_true(result.is_valid);
assert_int_equal(40, *(int*)arena_unwrap_pointer(result));
assert_int_equal(40, *(int *)arena_unwrap_pointer(result));
double_to_push = 267.33;
result = arena_push(arena, &double_to_push, sizeof(double), alignof(double));
result = arena_push_data(
arena,
&double_to_push,
sizeof(double),
alignof(double));
assert_true(result.is_valid);
assert_double_equal(267.33, *(double*)arena_unwrap_pointer(result), 1e-6);
assert_double_equal(267.33, *(double *)arena_unwrap_pointer(result), 1e-6);
arena_destroy(&arena);
}
static void test_init_arena_0_cap(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_int_equal(arena_init(&arena, 0), ARENA_INVALID_SIZE);
assert_int_equal(
arena_init(&arena, allocator_default(), 0),
ARENA_INVALID_SIZE);
}
static void test_arena_alloc_size_0(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaPointer pointer = arena_alloc(arena, 0, alignof(int));
assert_false(pointer.is_valid);
@@ -94,10 +110,10 @@ static void test_arena_alloc_size_0(void **state) {
}
static void test_arena_alloc_size_max(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaPointer pointer = arena_alloc(arena, SIZE_MAX, alignof(int));
assert_false(pointer.is_valid);
@@ -107,10 +123,10 @@ static void test_arena_alloc_size_max(void **state) {
}
static void test_arena_alloc_align_0(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaPointer pointer = arena_alloc(arena, sizeof(int), 0);
assert_false(pointer.is_valid);
@@ -120,10 +136,10 @@ static void test_arena_alloc_align_0(void **state) {
}
static void test_arena_alloc_align_max(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaPointer pointer = arena_alloc(arena, sizeof(int), SIZE_MAX);
assert_false(pointer.is_valid);
@@ -133,10 +149,10 @@ static void test_arena_alloc_align_max(void **state) {
}
static void test_arena_align_size_0(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaPointer pointer = arena_alloc(arena, sizeof(int), 0);
assert_false(pointer.is_valid);
@@ -146,10 +162,10 @@ static void test_arena_align_size_0(void **state) {
}
static void test_arena_ensure_capacity_size_0(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaErr err = arena_ensure_capacity(arena, 0, alignof(int));
assert_int_equal(err, ARENA_INVALID_SIZE);
@@ -158,10 +174,10 @@ static void test_arena_ensure_capacity_size_0(void **state) {
}
static void test_arena_ensure_capacity_size_max(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaErr err = arena_ensure_capacity(arena, SIZE_MAX, alignof(int));
assert_int_equal(err, ARENA_INVALID_SIZE);
@@ -170,10 +186,10 @@ static void test_arena_ensure_capacity_size_max(void **state) {
}
static void test_arena_ensure_capacity_align_0(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaErr err = arena_ensure_capacity(arena, sizeof(int), 0);
assert_int_equal(err, ARENA_INVALID_ALIGN);
@@ -182,10 +198,10 @@ static void test_arena_ensure_capacity_align_0(void **state) {
}
static void test_arena_ensure_capacity_align_max(void **state) {
(void) state;
(void)state;
Arena *arena;
assert_uint_equal(arena_init(&arena, 64), ARENA_OK);
assert_uint_equal(arena_init(&arena, allocator_default(), 64), ARENA_OK);
ArenaErr err = arena_ensure_capacity(arena, sizeof(int), SIZE_MAX);
assert_int_equal(err, ARENA_INVALID_ALIGN);
@@ -209,6 +225,5 @@ int main(void) {
cmocka_unit_test(test_arena_ensure_capacity_size_max),
};
return cmocka_run_group_tests(tests, NULL, NULL);
}