attempted to move to region based arena allocator
This commit is contained in:
parent
d70d2a9da2
commit
eb871068d8
2 changed files with 53 additions and 20 deletions
|
|
@ -3,30 +3,55 @@
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#define DEFAULT_ARENA_SIZE 1048576 /* 8 * 1024 * 1024 = 8MB */
|
#define DEFAUL_REGION_SIZE 1048576 /* 8 * 1024 * 1024 = 8MB */
|
||||||
|
|
||||||
|
Region *new_region(size_t capacity) {
|
||||||
|
if (capacity == 0) {
|
||||||
|
capacity = DEFAUL_REGION_SIZE;
|
||||||
|
}
|
||||||
|
Region *region = malloc(capacity);
|
||||||
|
assert(region != NULL);
|
||||||
|
*region = (Region){.next = NULL,
|
||||||
|
.capacity = capacity + sizeof(Region),
|
||||||
|
.cursor = sizeof(Region) - 1};
|
||||||
|
return region;
|
||||||
|
}
|
||||||
|
|
||||||
Arena arena_init(size_t capacity) {
|
Arena arena_init(size_t capacity) {
|
||||||
if (capacity == 0) {
|
Region *region = new_region(capacity);
|
||||||
capacity = DEFAULT_ARENA_SIZE;
|
Arena arena = {.begin = region, .end = region};
|
||||||
}
|
return arena;
|
||||||
Arena result = {.capacity = capacity, .size = 0, .data = malloc(capacity)};
|
|
||||||
assert(result.data != NULL);
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void arena_deinit(Arena *arena) {
|
void arena_deinit(Arena *arena) {
|
||||||
free(arena->data);
|
assert(arena->begin != NULL && arena->end != NULL);
|
||||||
*arena = (Arena){.capacity = 0, .size = 0, .data = NULL};
|
Region *region = arena->begin;
|
||||||
|
while (region != NULL) {
|
||||||
|
Region *next_region = region->next;
|
||||||
|
free(region);
|
||||||
|
region = next_region;
|
||||||
|
}
|
||||||
|
*arena = (Arena){.begin = NULL, .end = NULL};
|
||||||
}
|
}
|
||||||
|
|
||||||
void *arena_alloc(Arena *arena, size_t size) {
|
void *arena_alloc(Arena *arena, size_t size) {
|
||||||
assert(arena->size + size <= arena->capacity);
|
Region *region = arena->end;
|
||||||
void *result = &arena->data[arena->size];
|
assert(region != NULL);
|
||||||
arena->size += size;
|
|
||||||
|
if (region->cursor + size > region->capacity) {
|
||||||
|
if (size < DEFAUL_REGION_SIZE)
|
||||||
|
size = DEFAUL_REGION_SIZE;
|
||||||
|
region->next = new_region(size);
|
||||||
|
arena->end = region->next;
|
||||||
|
region = region->next;
|
||||||
|
}
|
||||||
|
|
||||||
|
void *result = ®ion->data[region->cursor];
|
||||||
|
region->cursor += size;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void *arena_clear(Arena *arena) {
|
//void *arena_clear(Arena *arena) {
|
||||||
arena->size = 0;
|
// arena->size = 0;
|
||||||
return arena->data;
|
// return arena->data;
|
||||||
}
|
//}
|
||||||
|
|
|
||||||
|
|
@ -1,15 +1,23 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
typedef struct Region_s Region;
|
||||||
|
struct Region_s {
|
||||||
|
Region *next;
|
||||||
|
size_t capacity;
|
||||||
|
size_t cursor;
|
||||||
|
uintptr_t data[];
|
||||||
|
};
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
size_t capacity;
|
Region *begin;
|
||||||
size_t size;
|
Region *end;
|
||||||
unsigned char *data;
|
|
||||||
} Arena;
|
} Arena;
|
||||||
|
|
||||||
Arena arena_init(size_t capacity);
|
Arena arena_init(size_t capacity);
|
||||||
void arena_deinit(Arena *arena);
|
void arena_deinit(Arena *arena);
|
||||||
|
|
||||||
void *arena_alloc(Arena *arena, size_t size);
|
void *arena_alloc(Arena *arena, size_t size);
|
||||||
void *arena_clear(Arena *arena);
|
//void *arena_clear(Arena *arena);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue