tom/ft_malloc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

norm almost ok, just too many functions

Browse Source
This commit is contained in:
tomoron
2024-11-29 19:11:41 +01:00
parent 2a3d29eb36
commit 59b60a0bd3
2 changed files with 87 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
srcs/includes/malloc.h
View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/26 16:38:01 by tomoron #+# #+# */ /* Created: 2024/11/26 16:38:01 by tomoron #+# #+# */
/* Updated: 2024/11/29 18:45:50 by tomoron ### ########.fr */ /* Updated: 2024/11/29 19:10:52 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -23,7 +23,6 @@
# define TINY_MALLOC 1024 # define TINY_MALLOC 1024
# define SMALL_MALLOC 4096 # define SMALL_MALLOC 4096
typedef struct s_alloc typedef struct s_alloc
{ {
size_t size; //8 size_t size; //8

20
srcs/malloc.c
View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/23 17:19:59 by tomoron #+# #+# */ /* Created: 2024/11/23 17:19:59 by tomoron #+# #+# */
/* Updated: 2024/11/29 18:48:26 by tomoron ### ########.fr */ /* Updated: 2024/11/29 19:00:29 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -20,7 +20,8 @@ void *get_memory(size_t size)
void *ptr; void *ptr;
t_mem_bloc *bloc_info; t_mem_bloc *bloc_info;
ptr = mmap(0, size, PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); ptr = mmap(0, size, PROT_WRITE | PROT_READ, MAP_ANONYMOUS | MAP_PRIVATE,
-1, 0);
if (ptr == MAP_FAILED) if (ptr == MAP_FAILED)
return (0); return (0);
bloc_info = ptr; bloc_info = ptr;
@ -41,12 +42,13 @@ void *allocate_memory(size_t size, t_mem_bloc **bloc)
return ((char *)new + sizeof(t_mem_bloc)); return ((char *)new + sizeof(t_mem_bloc));
} }
t_alloc *reserve_addr(t_alloc *addr, size_t size, t_alloc *prev, t_mem_bloc *bloc) t_alloc *reserve_addr(t_alloc *addr, size_t size, t_alloc *prev,
t_mem_bloc *bloc)
{ {
t_alloc *tmp; t_alloc *tmp;
if ((unsigned long)addr % 16) if ((unsigned long)addr % 16)
addr = (t_alloc *)((char *)addr + (16 - ((unsigned long)addr % 16))); //O_O addr = (t_alloc *)((char *)addr + (16 - ((unsigned long)addr % 16)));
addr->size = size; addr->size = size;
bloc->space_left -= (size + sizeof(t_alloc)); bloc->space_left -= (size + sizeof(t_alloc));
if (prev) if (prev)
@ -70,18 +72,18 @@ t_alloc *get_suitable_addr_in_bloc(t_mem_bloc *bloc, size_t size)
space_left = bloc->space_left; space_left = bloc->space_left;
while (tmp->next) while (tmp->next)
{ {
free_space = (tmp->next - tmp) - (tmp->size + sizeof(t_alloc)); //what free_space = (tmp->next - tmp) - (tmp->size + sizeof(t_alloc));
if (free_space >= size + sizeof(t_alloc)) if (free_space >= size + sizeof(t_alloc))
return (reserve_addr( return (reserve_addr(
(t_alloc *)((char *)tmp->next + tmp->size + sizeof(t_alloc)), (void *)((char *)tmp->next + tmp->size + sizeof(t_alloc)),
size, tmp, bloc)); // should be after size, tmp, bloc));
space_left -= free_space; space_left -= free_space;
} }
if (space_left >= size + sizeof(t_alloc)) if (space_left >= size + sizeof(t_alloc))
return (reserve_addr( return (reserve_addr(
(t_alloc *)((char *)tmp + tmp->size + sizeof(t_alloc)), (t_alloc *)((char *)tmp + tmp->size + sizeof(t_alloc)),
size, tmp, bloc)); //not sure about this function size, tmp, bloc));
return(0); //30 minutes later, I don't understand this return (0);
} }
t_mem_bloc *create_new_bloc(int is_small, t_mem_bloc **bloc, t_mem_bloc *prev) t_mem_bloc *create_new_bloc(int is_small, t_mem_bloc **bloc, t_mem_bloc *prev)