jack/42-archive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed debug messages and extra functions

Browse source
This commit is contained in:
Jack Halford 2017-03-01 12:18:03 +01:00
parent 3822058609
commit 829b295aa1
13 changed files with 29 additions and 94 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
malloc/Makefile
View file

@ -22,16 +22,13 @@ INC_DIR = includes/
OBJ_DIR = objs/ OBJ_DIR = objs/
SRC_BASE = \ SRC_BASE = \
calloc.c\
error_lib.c\ error_lib.c\
free.c\ free.c\
get_zones.c\ get_zones.c\
malloc.c\ malloc.c\
node_lib.c\ node_lib.c\
realloc.c\ realloc.c\
reallocf.c\ show_alloc_mem.c
show_alloc_mem.c\
valloc.c
SRCS = $(addprefix $(SRC_DIR), $(SRC_BASE)) SRCS = $(addprefix $(SRC_DIR), $(SRC_BASE))
OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o)) OBJS = $(addprefix $(OBJ_DIR), $(SRC_BASE:.c=.o))

8
malloc/includes/malloc.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 23:00:06 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 *calloc(size_t count, size_t size);
void free(void *ptr); void free(void *ptr);
void *malloc(size_t size); void *malloc(size_t size);
void *realloc(void *ptr, size_t size); /* void *realloc(void *ptr, size_t size); */
void *reallocf(void *ptr, size_t size); /* void *reallocf(void *ptr, size_t size); */
void *valloc(size_t size); /* void *valloc(size_t size); */
void show_alloc_mem(void); void show_alloc_mem(void);
# pragma GCC visibility pop # pragma GCC visibility pop

2
malloc/includes/malloc_internal.h
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 23:00:24 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

5
malloc/run.sh Executable file
View file

@ -0,0 +1,5 @@
#!/bin/sh
export DYLD_LIBRARY_PATH=.
export DYLD_INSERT_LIBRARIES="libft_malloc.so"
export DYLD_FORCE_FLAT_NAMESPACE=1
$@

21
malloc/src/calloc.c
View file

@ -1,21 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* calloc.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}

10
malloc/src/free.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 12:28:03 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 **alloc_ref;
t_node *node; t_node *node;
ft_putstr(FG_YELLOW"free("); /* ft_putstr(FG_YELLOW"free("); */
ft_putnbr_hex((long)ptr); /* ft_putnbr_hex((long)ptr); */
ft_putendl(")"FG_DEFAULT); /* ft_putendl(")"FG_DEFAULT); */
if (!ptr) if (!ptr)
return ; return ;
node = ptr - HEADER_SIZE; node = ptr - HEADER_SIZE;
@ -51,7 +51,7 @@ void free(void *ptr)
/* *zone_ref ? print_node(BG_MAGENTA, *zone_ref) : ft_putendl(" NULL"); */ /* *zone_ref ? print_node(BG_MAGENTA, *zone_ref) : ft_putendl(" NULL"); */
if (remove_node(alloc_ref, node)) if (remove_node(alloc_ref, node))
{ {
error_free_notalloc(ptr); /* error_free_notalloc(ptr); */
return ; return ;
} }
insert_node(zone_ref, node); insert_node(zone_ref, node);

12
malloc/src/malloc.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 12:28:02 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_ref;
t_node *node; t_node *node;
ft_putstr(FG_YELLOW"malloc("); /* ft_putstr(FG_YELLOW"malloc("); */
ft_putnbr(size); /* ft_putnbr(size); */
ft_putendl(")"FG_DEFAULT); /* ft_putendl(")"FG_DEFAULT); */
get_zones(&zone_ref, &alloc_ref, size); get_zones(&zone_ref, &alloc_ref, size);
while (!*(node_ref = find_node_firstfit(zone_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); node = split_node(node_ref, alloc_ref, zone_ref, size);
ft_putstr("touser@"); /* ft_putstr("touser@"); */
print_node(FG_RED, node); /* print_node(FG_RED, node); */
/* ft_putstr("passing "FG_RED); */ /* ft_putstr("passing "FG_RED); */
/* ft_putnbr_hex((long)node->data); */ /* ft_putnbr_hex((long)node->data); */
/* ft_putendl(FG_DEFAULT" to user"); */ /* ft_putendl(FG_DEFAULT" to user"); */

12
malloc/src/node_lib.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/17 12:28:15 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) while (*head)
{ {
ft_putstr("looking for node -> ["); /* ft_putstr("looking for node -> ["); */
ft_putnbr_hex((long)node); /* ft_putnbr_hex((long)node); */
ft_putstr(","); /* ft_putstr(","); */
ft_putnbr_hex((long)*head); /* ft_putnbr_hex((long)*head); */
ft_putendl("]"); /* ft_putendl("]"); */
if (*head == node) if (*head == node)
{ {
*head = (*head)->next; *head = (*head)->next;

2
malloc/src/realloc.c
View file

@ -6,7 +6,7 @@
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */ /* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2017/02/18 13:23:20 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 */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */

21
malloc/src/reallocf.c
View file

@ -1,21 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* reallocf.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}

20
malloc/src/valloc.c
View file

@ -1,20 +0,0 @@
/* ************************************************************************** */
/* */
/* ::: :::::::: */
/* valloc.c :+: :+: :+: */
/* +:+ +:+ +:+ */
/* By: jhalford <jack@crans.org> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* 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);
}

5
malloc/tests/run.sh
View file

@ -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
$@

BIN
malloc/tests/test0
View file

Binary file not shown.