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

update: changed some stuff

Browse source
This commit is contained in:
maix0 2024-10-23 15:36:18 +02:00
parent 78b9506885
commit cfbb84c028
10 changed files with 31 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

1
allocator/Filelist.aq.mk
View file

@ -3,7 +3,6 @@ lc_alloc/functions1 \
lc_alloc/functions2 \
me_alloc/find_block \
me_alloc/functions1 \
me_alloc/functions2 \
me_alloc/internals \
me_alloc/merge_blocks \
me_alloc/pages \

20
allocator/src/lc_alloc/functions1.c
View file

@ -14,39 +14,39 @@
#include "aq/libc_wrapper.h"
#include "me/types.h"
void *__libc_malloc(t_usize size);
void *__libc_calloc(t_usize size, t_usize elem);
void *__libc_realloc(void *ptr, t_usize size);
void *__libc_reallocarray(void *ptr, t_usize size, t_usize elem);
void __libc_free(void *ptr);
void *malloc(t_usize size);
void *calloc(t_usize size, t_usize elem);
void *realloc(void *ptr, t_usize size);
void *reallocarray(void *ptr, t_usize size, t_usize elem);
void free(void *ptr);
void *lc_malloc(t_allocator *self, t_usize size)
{
(void)(self);
return (__libc_malloc(size));
return (malloc(size));
}
void *lc_calloc(t_allocator *self, t_usize size, t_usize elem)
{
(void)(self);
return (__libc_calloc(size, elem));
return (calloc(size, elem));
}
void *lc_realloc(t_allocator *self, void *ptr, t_usize size)
{
(void)(self);
return (__libc_realloc(ptr, size));
return (realloc(ptr, size));
}
void *lc_realloc_array(t_allocator *self, void *ptr, t_usize size,
t_usize elem)
{
(void)(self);
return (__libc_reallocarray(ptr, size, elem));
return (reallocarray(ptr, size, elem));
}
void lc_free(t_allocator *self, void *ptr)
{
(void)(self);
return (__libc_free(ptr));
return (free(ptr));
}

8
allocator/src/me_alloc/functions1.c
View file

@ -18,8 +18,8 @@
#include <assert.h>
#include <errno.h>
void *__libc_malloc(t_usize size);
void __libc_free(void *ptr);
void *malloc(t_usize size);
void free(void *ptr);
void *m_malloc(struct s_allocator_melloc *self, t_usize size)
{
@ -64,14 +64,14 @@ void m_uninit(struct s_allocator_melloc *self)
if (list->pages[idx].data != NULL)
{
vg_mempool_free(list, list->pages[idx].data);
__libc_free(list->pages[idx].data);
free(list->pages[idx].data);
list->pages[idx].size = 0;
list->pages[idx].data = NULL;
}
idx++;
}
list_next = list->next;
(__libc_free(list), vg_mempool_destroy(list), \
(free(list), vg_mempool_destroy(list), \
vg_mem_no_access(list, sizeof(*list)));
list = list_next;
}

19
allocator/src/me_alloc/functions2.c
View file

@ -1,19 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* functions2.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/05/14 18:06:34 by maiboyer #+# #+# */
/* Updated: 2024/10/12 17:51:05 by rparodi ### ########.fr */
/* */
/* ************************************************************************** */
#include "aq/allocator.h"
#include "aq/libc_wrapper.h"
// void lc_uninit(t_allocator *self)
// {
// (void)(self);
// }

12
allocator/src/me_alloc/pages.c
View file

@ -6,7 +6,7 @@
/* By: maiboyer <maiboyer@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/07/10 16:51:10 by maiboyer #+# #+# */
/* Updated: 2024/10/12 17:51:07 by rparodi ### ########.fr */
/* Updated: 2024/10/23 14:52:47 by maiboyer ### ########.fr */
/* */
/* ************************************************************************** */
@ -17,8 +17,8 @@
#include "me/types.h"
#include <errno.h>
void *__libc_malloc(t_usize size);
void __libc_free(void *ptr);
void *malloc(t_usize size);
void free(void *ptr);
t_error alloc_page_list(t_page_list **out)
{
@ -26,7 +26,7 @@ t_error alloc_page_list(t_page_list **out)
if (out == NULL)
return (ERROR);
val = __libc_malloc(sizeof(*val));
val = malloc(sizeof(*val));
if (val == NULL)
return (ERROR);
mem_set_zero(val, sizeof(*val));
@ -43,10 +43,10 @@ t_error _alloc_new_page_inner(t_usize page_size, t_page_list *list)
if (list == NULL)
return (ERROR);
vg_mem_defined(list, sizeof(*list));
list->pages[list->len].data = __libc_malloc(page_size);
mem_set_zero(list->pages[list->len].data, page_size);
list->pages[list->len].data = malloc(page_size);
if (list->pages[list->len].data == NULL)
return (ERROR);
mem_set_zero(list->pages[list->len].data, page_size);
list->pages[list->len].size = page_size;
vg_mempool_alloc(list, list->pages[list->len].data, page_size);
chunk = get_first_block(&list->pages[list->len]);