From 0cacbbeb721f1eb43a8dd2ff01f08507aaa28881 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Mon, 20 Feb 2017 17:11:59 +0100 Subject: [PATCH] tests/ dir --- malloc/includes/malloc.h | 2 +- malloc/includes/malloc_internal.h | 2 +- malloc/libft_malloc_x86_64_Darwin.so | Bin 13836 -> 13836 bytes malloc/main.c | 20 -------------------- malloc/src/free.c | 2 +- malloc/src/malloc.c | 6 +++++- malloc/src/show_alloc_mem.c | 2 +- malloc/test0.c | 12 ------------ 8 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 malloc/main.c delete mode 100644 malloc/test0.c diff --git a/malloc/includes/malloc.h b/malloc/includes/malloc.h index 36128d63..c7b46306 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/18 18:53:22 by jhalford ### ########.fr */ +/* Updated: 2017/02/20 17:03:33 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/includes/malloc_internal.h b/malloc/includes/malloc_internal.h index f81845d1..90247545 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/18 20:06:55 by jhalford ### ########.fr */ +/* Updated: 2017/02/20 17:03:44 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/libft_malloc_x86_64_Darwin.so b/malloc/libft_malloc_x86_64_Darwin.so index 0f30e1deef8e947ee01a727572bbc7346171f01f..ab0778456a06b226e174e8faf46a34036dbb4ab8 100755 GIT binary patch delta 147 zcmV;E0Brw^Y>aHMpac--%_LnJr#EwtWVJWeo0cfEumq+G0d|vD50(P21C#F$Y63$8 zvs)1U0Rlq-lUou>0r!)p5-$jY>_AA11u+eiJrgkk1`CsL6J8?@|Ns9;iv^bq002mf z07yGU_z#5!0000;gTz2x!{`?Z005K04-}Kt5@M4F6k-8mvuYIE9Rtt-V6#Xv!~>%L BGlKvC delta 145 zcmV;C0B-+`Y>aHMpac-p-yJuj`Z(!_nYkMXQGV~Uumq+G0oIdO50(Po0+a6#Y65ct zvs)1U0RnRXlUou>0Vk8D5-*db6JiEHNQ(v043pgwF#@IvlMoYLBd-4c|454kHw*v( zNQ(eSJ4N^pg$4is07!$xKwZP=w+R3Mlfe%blLr)H0mHLu6x$sGV9)`xNHW9&E{`>i diff --git a/malloc/main.c b/malloc/main.c deleted file mode 100644 index def26fb9..00000000 --- a/malloc/main.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include "includes/malloc.h" - -int main(void) -{ - void *ptr0 = malloc(4096); - show_alloc_mem(); - - void *ptr1 = malloc(16); - show_alloc_mem(); - - free(ptr0); - show_alloc_mem(); - - void *ptr2 = malloc(16); - show_alloc_mem(); - - void *ptr3 = malloc(32); - show_alloc_mem(); -} diff --git a/malloc/src/free.c b/malloc/src/free.c index c5f53356..1960eedc 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/18 20:10:24 by jhalford ### ########.fr */ +/* Updated: 2017/02/20 16:56:23 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/src/malloc.c b/malloc/src/malloc.c index 93ad0b58..68f78864 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/18 20:08:49 by jhalford ### ########.fr */ +/* Updated: 2017/02/20 17:11:20 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -55,7 +55,11 @@ void *malloc(size_t size) ft_putstr("found @"); print_node(FG_GREEN, *node_ref); node = split_node(node_ref, alloc_ref, zone_ref, size); + ft_putstr("touser@"); print_node(FG_RED, node); + ft_putstr(FG_YELLOW"passing "); + ft_putnbr_hex((long)node->data); + ft_putendl(" to user"FG_DEFAULT); return (node->data); } diff --git a/malloc/src/show_alloc_mem.c b/malloc/src/show_alloc_mem.c index ec7797e8..909c6f40 100644 --- a/malloc/src/show_alloc_mem.c +++ b/malloc/src/show_alloc_mem.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/02/17 12:28:20 by jhalford #+# #+# */ -/* Updated: 2017/02/18 19:58:20 by jhalford ### ########.fr */ +/* Updated: 2017/02/20 17:11:29 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/malloc/test0.c b/malloc/test0.c deleted file mode 100644 index b5830dce..00000000 --- a/malloc/test0.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "includes/malloc.h" - -int main(void) -{ - int i; - char *addr; - - i = 0; - while (i < 1024) - i++; - return (0); -}