From 829b295aa10bc42aa25462d54bb27906e93f1bf2 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Wed, 1 Mar 2017 12:18:03 +0100 Subject: [PATCH] removed debug messages and extra functions --- malloc/Makefile | 5 +---- malloc/includes/malloc.h | 8 ++++---- malloc/includes/malloc_internal.h | 2 +- malloc/run.sh | 5 +++++ malloc/src/calloc.c | 21 --------------------- malloc/src/free.c | 10 +++++----- malloc/src/malloc.c | 12 ++++++------ malloc/src/node_lib.c | 12 ++++++------ malloc/src/realloc.c | 2 +- malloc/src/reallocf.c | 21 --------------------- malloc/src/valloc.c | 20 -------------------- malloc/tests/run.sh | 5 ----- malloc/tests/test0 | Bin 8432 -> 8432 bytes 13 files changed, 29 insertions(+), 94 deletions(-) create mode 100755 malloc/run.sh delete mode 100644 malloc/src/calloc.c delete mode 100644 malloc/src/reallocf.c delete mode 100644 malloc/src/valloc.c delete mode 100755 malloc/tests/run.sh diff --git a/malloc/Makefile b/malloc/Makefile index 9df7aa54..fc153c17 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -22,16 +22,13 @@ INC_DIR = includes/ OBJ_DIR = objs/ SRC_BASE = \ -calloc.c\ error_lib.c\ free.c\ get_zones.c\ malloc.c\ node_lib.c\ realloc.c\ -reallocf.c\ -show_alloc_mem.c\ -valloc.c +show_alloc_mem.c SRCS = $(addprefix $(SRC_DIR), $(SRC_BASE)) OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o)) diff --git a/malloc/includes/malloc.h b/malloc/includes/malloc.h index eadcded5..4fc97179 100644 --- a/malloc/includes/malloc.h +++ b/malloc/includes/malloc.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 23:00:06 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:12:51 by jhalford ### ########.fr */ +/* Updated: 2017/03/01 12:01:58 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -20,9 +20,9 @@ void *calloc(size_t count, size_t size); void free(void *ptr); void *malloc(size_t size); -void *realloc(void *ptr, size_t size); -void *reallocf(void *ptr, size_t size); -void *valloc(size_t size); +/* void *realloc(void *ptr, size_t size); */ +/* void *reallocf(void *ptr, size_t size); */ +/* void *valloc(size_t size); */ void show_alloc_mem(void); # pragma GCC visibility pop diff --git a/malloc/includes/malloc_internal.h b/malloc/includes/malloc_internal.h index f2612157..ea3edd95 100644 --- a/malloc/includes/malloc_internal.h +++ b/malloc/includes/malloc_internal.h @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 23:00:24 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:11:45 by jhalford ### ########.fr */ +/* Updated: 2017/03/01 12:03:35 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/run.sh b/malloc/run.sh new file mode 100755 index 00000000..19faa239 --- /dev/null +++ b/malloc/run.sh @@ -0,0 +1,5 @@ +#!/bin/sh +export DYLD_LIBRARY_PATH=. +export DYLD_INSERT_LIBRARIES="libft_malloc.so" +export DYLD_FORCE_FLAT_NAMESPACE=1 +$@ diff --git a/malloc/src/calloc.c b/malloc/src/calloc.c deleted file mode 100644 index caef0b9a..00000000 --- a/malloc/src/calloc.c +++ /dev/null @@ -1,21 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* calloc.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2017/02/21 16:13:00 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:16:59 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "malloc_internal.h" - -void *calloc(size_t count, size_t size) -{ - (void)count; - (void)size; - ft_putstr("calloc() called\n"); - return (NULL); -} diff --git a/malloc/src/free.c b/malloc/src/free.c index 740e196f..79491db3 100644 --- a/malloc/src/free.c +++ b/malloc/src/free.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 12:28:03 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:36:51 by jhalford ### ########.fr */ +/* Updated: 2017/03/01 12:04:36 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -40,9 +40,9 @@ void free(void *ptr) t_node **alloc_ref; t_node *node; - ft_putstr(FG_YELLOW"free("); - ft_putnbr_hex((long)ptr); - ft_putendl(")"FG_DEFAULT); + /* ft_putstr(FG_YELLOW"free("); */ + /* ft_putnbr_hex((long)ptr); */ + /* ft_putendl(")"FG_DEFAULT); */ if (!ptr) return ; node = ptr - HEADER_SIZE; @@ -51,7 +51,7 @@ void free(void *ptr) /* *zone_ref ? print_node(BG_MAGENTA, *zone_ref) : ft_putendl(" NULL"); */ if (remove_node(alloc_ref, node)) { - error_free_notalloc(ptr); + /* error_free_notalloc(ptr); */ return ; } insert_node(zone_ref, node); diff --git a/malloc/src/malloc.c b/malloc/src/malloc.c index 8d87b509..e6671c57 100644 --- a/malloc/src/malloc.c +++ b/malloc/src/malloc.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 12:28:02 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:37:32 by jhalford ### ########.fr */ +/* Updated: 2017/03/01 12:15:24 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -46,9 +46,9 @@ void *malloc(size_t size) t_node **node_ref; t_node *node; - ft_putstr(FG_YELLOW"malloc("); - ft_putnbr(size); - ft_putendl(")"FG_DEFAULT); + /* ft_putstr(FG_YELLOW"malloc("); */ + /* ft_putnbr(size); */ + /* ft_putendl(")"FG_DEFAULT); */ get_zones(&zone_ref, &alloc_ref, size); while (!*(node_ref = find_node_firstfit(zone_ref, size))) @@ -59,8 +59,8 @@ void *malloc(size_t size) node = split_node(node_ref, alloc_ref, zone_ref, size); - ft_putstr("touser@"); - print_node(FG_RED, node); + /* ft_putstr("touser@"); */ + /* print_node(FG_RED, node); */ /* ft_putstr("passing "FG_RED); */ /* ft_putnbr_hex((long)node->data); */ /* ft_putendl(FG_DEFAULT" to user"); */ diff --git a/malloc/src/node_lib.c b/malloc/src/node_lib.c index f12cdabd..9597114a 100644 --- a/malloc/src/node_lib.c +++ b/malloc/src/node_lib.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 12:28:15 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:07:24 by jhalford ### ########.fr */ +/* Updated: 2017/03/01 12:04:08 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -55,11 +55,11 @@ int remove_node(t_node **head, t_node *node) { while (*head) { - ft_putstr("looking for node -> ["); - ft_putnbr_hex((long)node); - ft_putstr(","); - ft_putnbr_hex((long)*head); - ft_putendl("]"); + /* ft_putstr("looking for node -> ["); */ + /* ft_putnbr_hex((long)node); */ + /* ft_putstr(","); */ + /* ft_putnbr_hex((long)*head); */ + /* ft_putendl("]"); */ if (*head == node) { *head = (*head)->next; diff --git a/malloc/src/realloc.c b/malloc/src/realloc.c index ffd0a757..dedb3e5b 100644 --- a/malloc/src/realloc.c +++ b/malloc/src/realloc.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/18 13:23:20 by jhalford #+# #+# */ -/* Updated: 2017/02/18 18:08:11 by jhalford ### ########.fr */ +/* Updated: 2017/03/01 12:15:31 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/src/reallocf.c b/malloc/src/reallocf.c deleted file mode 100644 index bc8e9e0b..00000000 --- a/malloc/src/reallocf.c +++ /dev/null @@ -1,21 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* reallocf.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2017/02/21 16:13:44 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:15:30 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "malloc_internal.h" - -void *reallocf(void *ptr, size_t size) -{ - (void)ptr; - (void)size; - ft_putstr("reaallocf() called\n"); - return (NULL); -} diff --git a/malloc/src/valloc.c b/malloc/src/valloc.c deleted file mode 100644 index f9062d67..00000000 --- a/malloc/src/valloc.c +++ /dev/null @@ -1,20 +0,0 @@ -/* ************************************************************************** */ -/* */ -/* ::: :::::::: */ -/* valloc.c :+: :+: :+: */ -/* +:+ +:+ +:+ */ -/* By: jhalford +#+ +:+ +#+ */ -/* +#+#+#+#+#+ +#+ */ -/* Created: 2017/02/21 16:14:26 by jhalford #+# #+# */ -/* Updated: 2017/02/21 16:16:59 by jhalford ### ########.fr */ -/* */ -/* ************************************************************************** */ - -#include "malloc_internal.h" - -void *valloc(size_t size) -{ - (void)size; - ft_putstr("valloc() called\n"); - return (NULL); -} diff --git a/malloc/tests/run.sh b/malloc/tests/run.sh deleted file mode 100755 index 837aeda7..00000000 --- a/malloc/tests/run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# export DYLD_LIBRARY_PATH=$HOME"/42/libft_malloc/" -export DYLD_INSERT_LIBRARIES=$HOME"/42/libft_malloc/libft_malloc.so" -export DYLD_FORCE_FLAT_NAMESPACE=1 -$@ diff --git a/malloc/tests/test0 b/malloc/tests/test0 index a4728a4279e8e779d62321cdca298b6419158e9d..26fd3f0de80ad2cbe6f181ede4a1aa48727f6217 100755 GIT binary patch delta 77 zcmV-T0J8t^LGVEp&-(5D2LJ#80{{Sk0ssI24*&oFV6hd;0}#kyO&6)ZHNuZ|-pV)( j!CjN^14y%Q1kehT&;&TMKo7_e0TGi4AeI3Elb|3_Fwq+p delta 111 zcmez1_`y;1{I9qF*cliYnHd-wm>3us1b}$PM$yyE0+;s}eDeEdsNXMYvNTyDHDK}w zW)D@MEEwcuCZ(0c=O*Ul