raphael/minishell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hopefully a working allocator !

Browse source
This commit is contained in:
Maix0 2024-05-10 21:40:19 +02:00
parent a149e9a860
commit b639b0c14e
8 changed files with 53 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

30
stdme/src/alloc/get_arena.c
View file

@ -28,21 +28,18 @@ t_mpage *alloc_page(t_usize size)
{
t_mpage *val;
size = usize_round_up_to(size, PAGE_SIZE_DEFAULT);
val = __libc_malloc(PAGE_SIZE_DEFAULT);
if (val == NULL || sizeof(t_mpage) >= PAGE_SIZE_DEFAULT)
size = usize_round_up_to(size + sizeof(t_mpage), PAGE_SIZE_DEFAULT);
val = __libc_malloc(size);
if (val == NULL || sizeof(t_mpage) + sizeof(t_mblock) >= PAGE_SIZE_DEFAULT)
return (NULL);
val->next = NULL;
val->page_size = PAGE_SIZE_DEFAULT;
val->page_size = size;
val->first = (t_mblock *)(((t_usize)val) + sizeof(t_mpage));
val->first->page = val;
val->first->next = NULL;
mem_copy(val->first->padding, BLOCK_PADDING, 7);
val->first->used = false;
val->first->size = PAGE_SIZE_DEFAULT - sizeof(t_mpage);
me_putstr_fd("Allocating a page of size ", 2);
me_putnbr_fd(size, 2);
me_putendl_fd("", 2);
val->first->size = size - sizeof(t_mblock) - sizeof(t_mpage);
return (val);
}
@ -50,8 +47,8 @@ t_mpage *get_head_arena(void)
{
static t_mpage *val = NULL;
if (val == NULL)
val = alloc_page(PAGE_SIZE_DEFAULT);
if (val == NULL && PAGE_SIZE_DEFAULT > sizeof(t_mpage))
val = alloc_page(PAGE_SIZE_DEFAULT - sizeof(t_mpage));
if (val == NULL)
(me_putstr_fd("Failed to alloc first page", 2), exit(1));
return (val);
@ -63,15 +60,16 @@ t_mblock *split_block(t_mblock *self, t_usize min_size)
t_mblock *old_next;
min_size = usize_round_up_to(min_size, 16);
if (self->size > (min_size + sizeof(t_mpage) + 16))
if (self->size > (min_size + sizeof(t_mblock) + 16))
{
remaining = self->size - min_size - sizeof(t_mpage);
printf("Splitting %zu into %zu and %zu\n", self->size, min_size,
remaining);
remaining = self->size - min_size - sizeof(t_mblock);
printf("splitting %zu into %zu and %zu\n", self->size, min_size, remaining);
if (self->size == 80 && min_size == 16 && remaining == 32)
printf("HERE\n");
self->size = min_size;
old_next = self->next;
self->next =
(t_mblock *)(((t_usize)self) + self->size + sizeof(t_mpage));
(t_mblock *)(((t_usize)self) + self->size + sizeof(t_mblock));
self->next->page = self->page;
self->next->next = old_next;
self->next->used = false;
@ -97,7 +95,7 @@ t_mblock *get_block_for_size(t_usize size)
}
if (last == NULL)
return (NULL);
last->page->next = alloc_page(size);
last->page->next = alloc_page(size + sizeof(t_mblock));
if (last->page->next == NULL)
me_abort("Failed to alloc page!");
last->next = last->page->next->first;