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

fix HOSTTYPE setting even if env var is set. changes to free to not unmap first chunk and add env setting NO_UNMAP

Browse Source
This commit is contained in:
tomoron
2025-03-20 17:03:35 +01:00
parent 13c3e9a77b
commit 016dcba92a
4 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -9,7 +9,7 @@
# # # #
# **************************************************************************** # # **************************************************************************** #
HOSTTYPE := $(shell uname -m)_$(shell uname -s) HOSTTYPE ?= $(shell uname -m)_$(shell uname -s)
NAME := libft_malloc_$(HOSTTYPE).so NAME := libft_malloc_$(HOSTTYPE).so
@ -47,13 +47,13 @@ exec: $(OBJS_DIR) $(NAME) $(LFT)
$(CC) -o a.out $(FLAGS) main.c -L. -lft_malloc $(LFT) -Wl,-rpath=. $(CC) -o a.out $(FLAGS) main.c -L. -lft_malloc $(LFT) -Wl,-rpath=.
libft_malloc.so: $(NAME) libft_malloc.so: $(NAME)
ln -sf $(NAME) libft_malloc.so ln -sf "$(NAME)" libft_malloc.so
$(LFT): $(LFT):
make -j$(shell nproc) -C $(LFT_DIR) make -j$(shell nproc) -C $(LFT_DIR)
$(NAME): $(OBJS_DIR) $(OBJS) $(LFT) $(NAME): $(OBJS_DIR) $(OBJS) $(LFT)
$(CC) -shared -o $(NAME) $(OBJS) $(LFT) $(CC) -shared -o "$(NAME)" $(OBJS) $(LFT)
$(OBJS_DIR): $(OBJS_DIR):
mkdir -p $(OBJS_DIR) mkdir -p $(OBJS_DIR)
@ -66,7 +66,7 @@ clean:
make -C $(LFT_DIR) fclean make -C $(LFT_DIR) fclean
fclean: clean fclean: clean
rm -f $(NAME) rm -f "$(NAME)"
rm -f libft_malloc.so rm -f libft_malloc.so
re: fclean all re: fclean all

4
srcs/env_debug.c
View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/12/06 19:16:40 by tomoron #+# #+# */ /* Created: 2024/12/06 19:16:40 by tomoron #+# #+# */
/* Updated: 2025/02/14 17:24:10 by tomoron ### ########.fr */ /* Updated: 2025/03/20 16:58:18 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -21,6 +21,8 @@ t_settings *get_settings(void)
{ {
if (getenv("MALLOC_SHOW_LEAKS")) if (getenv("MALLOC_SHOW_LEAKS"))
settings.show_leaks = 1; settings.show_leaks = 1;
if (getenv("MALLOC_NO_UNMAP"))
settings.no_unmap = 1;
str = getenv("MALLOC_DEBUG_LEVEL"); str = getenv("MALLOC_DEBUG_LEVEL");
if (!str || !ft_strcmp(str, "NONE")) if (!str || !ft_strcmp(str, "NONE"))
settings.debug_level = 0; settings.debug_level = 0;

26
srcs/free.c
View File

@ -6,7 +6,7 @@
/* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */ /* By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/11/30 18:46:07 by tomoron #+# #+# */ /* Created: 2024/11/30 18:46:07 by tomoron #+# #+# */
/* Updated: 2025/02/14 17:20:17 by tomoron ### ########.fr */ /* Updated: 2025/03/20 17:00:04 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -61,6 +61,24 @@ int get_prev_alloc(t_alloc **alloc, t_alloc **res, t_alloc *cur, char *fnc)
return (0); return (0);
} }
static void free_chunk(size_t size, t_mem_chunk *chunk, t_mem_chunk **main_chunk)
{
t_mem_chunk *prev;
prev = *main_chunk;
if(*main_chunk == chunk)
prev = 0;
while(prev && prev->next != chunk)
prev = prev->next;
if (!prev && !chunk->next)
return;
if(prev)
prev->next = chunk->next;
else
*main_chunk = chunk->next;
munmap(chunk, size);
}
static int free_prealloc(t_alloc *alloc, t_mem_chunk **main_chunk, \ static int free_prealloc(t_alloc *alloc, t_mem_chunk **main_chunk, \
int is_small) int is_small)
{ {
@ -79,15 +97,13 @@ static int free_prealloc(t_alloc *alloc, t_mem_chunk **main_chunk, \
chunk->first = alloc->next; chunk->first = alloc->next;
else if (prev) else if (prev)
prev->next = alloc->next; prev->next = alloc->next;
if (!chunk->first) if (!chunk->first && !get_settings()->no_unmap)
{ {
if (*main_chunk == chunk)
*main_chunk = chunk->next;
if (is_small) if (is_small)
size = SMALL_CHUNK_SIZE; size = SMALL_CHUNK_SIZE;
else else
size = TINY_CHUNK_SIZE; size = TINY_CHUNK_SIZE;
munmap(chunk, size); free_chunk(size, chunk, main_chunk);
} }
return (1); return (1);
} }

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: 2025/02/15 15:00:21 by tomoron ### ########.fr */ /* Updated: 2025/03/20 16:58:10 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -57,6 +57,7 @@ typedef struct t_settings
{ {
uint8_t debug_level:2; uint8_t debug_level:2;
uint8_t show_leaks:1; uint8_t show_leaks:1;
uint8_t no_unmap:1;
uint8_t initialized:1; uint8_t initialized:1;
} t_settings; //size 1 } t_settings; //size 1