diff --git a/firmware/malloc/Makefile b/firmware/malloc/Makefile new file mode 100644 index 0000000000..d4c6436184 --- /dev/null +++ b/firmware/malloc/Makefile @@ -0,0 +1,40 @@ +# __________ __ ___. +# Open \______ \ ____ ____ | | _\_ |__ _______ ___ +# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +# \/ \/ \/ \/ \/ +# $Id$ +# +# Copyright (C) 2002 by Daniel Stenberg +# +# All files in this archive are subject to the GNU General Public License. +# See the file COPYING in the source tree root for full license agreement. +# +# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY +# KIND, either express or implied. +# + +TARGET = libdmalloc.a + +LIBOBJS = dmalloc.o bmalloc.o bysize.o + +# define this to talk a lot in runtime +# -DDEBUG_VERBOSE +CFLAGS = -g -Wall -DDEBUG +CC = gcc +AR = ar + +LDFLAGS = -L. -ldmalloc + +all: $(TARGET) + +clean: + rm -f core *~ $(TARGET) $(LIBOBJS) + +$(TARGET): $(LIBOBJS) + $(AR) ruv $(TARGET) $(LIBOBJS) + +bmalloc.o: bmalloc.c bysize.h +bysize.o: bysize.c +dmalloc.o: dmalloc.c diff --git a/firmware/test/malloc/README b/firmware/malloc/README similarity index 92% rename from firmware/test/malloc/README rename to firmware/malloc/README index 4eef20d5f4..336bd571ae 100644 --- a/firmware/test/malloc/README +++ b/firmware/malloc/README @@ -2,7 +2,7 @@ Package: dbestfit - a dynamic best-fit memory allocator Date: 1996 - 2002 Version: 3.3 Author: Daniel Stenberg -License: MIT +License: MIT originally, files in the Rockbox project are GPL licensed. I wrote the dmalloc part for small allocation sizes to improve the behavior of the built-in (first-fit) allocator found in pSOS, during late 1996 and diff --git a/firmware/test/malloc/THOUGHTS b/firmware/malloc/THOUGHTS similarity index 89% rename from firmware/test/malloc/THOUGHTS rename to firmware/malloc/THOUGHTS index d509d36d2a..27517361da 100644 --- a/firmware/test/malloc/THOUGHTS +++ b/firmware/malloc/THOUGHTS @@ -1,6 +1,6 @@ - ===================================== - Memory Allocation Algorithm Theories. - ===================================== + ==================================== + Memory Allocation Algorithm Theories + ==================================== GOAL It is intended to be a 100% working memory allocation system. It should be @@ -15,8 +15,8 @@ GOAL TERMINOLOGY - FRAGMENT - small identically sized parts of a larger BLOCK, they are when - travered in lists etc _not_ allocated. + FRAGMENT - small identically sized parts of a larger BLOCK, they are _not_ + allocated when traversed in lists etc BLOCK - large memory area, if used for FRAGMENTS, they are linked in a lists. One list for each FRAGMENT size supported. TOP - head struct that holds information about and points to a chain @@ -39,12 +39,12 @@ MEMORY SYSTEM ALLOC * Small allocations are "aligned" upwards to a set of preset sizes. In the - current implementation I use 20, 28, 52, 116, 312, 580, 812, 2028 bytes. - Memory allocations of these sizes are refered to as FRAGMENTS. + current implementation I use 20, 28, 52, 116, 312, 580, 1016, 2032 bytes. + Memory allocations of these sizes are referred to as FRAGMENTS. (The reason for these specific sizes is the requirement that they must be - 32-bit aligned and fit as good as possible within 4060 bytes.) + 32-bit aligned and fit as good as possible within 4064 bytes.) - * Allocations larger than 2028 will get a BLOCK for that allocation only. + * Allocations larger than 2032 will get a BLOCK for that allocation only. * Each of these sizes has it's own TOP. When a FRAGMENT is requested, a larger BLOCK will be allocated and divided into many FRAGMENTS (all of the @@ -52,12 +52,12 @@ MEMORY SYSTEM the same size. Each BLOCK has a 'number of free FRAGMENTS' counter and so has each TOP (for the entire chain). - * A BLOCK is around 4060 bytes plus the size of the information header. This + * A BLOCK is around 4064 bytes plus the size of the information header. This size is adjusted to make the allocation of the big block not require more than 4096 bytes. (This might not be so easy to be sure of, if you don't know how the big-block system works, but the BMALLOC system uses an extra header of 12 bytes and the header for the FRAGMENT BLOCK is 20 bytes - in a general 32-bit unix environment.) + in a general 32-bit environment.) * In case the allocation of a BLOCK fails when a FRAGMENT is required, the next size of FRAGMENTS will be checked for a free FRAGMENT. First when the @@ -122,16 +122,16 @@ MEMORY SYSTEM no real gain in increasing the size of the align. * We link *all* pieces of memory (AREAS), free or not free. We keep the list - in address order and thus when a FREE() occurs we know instanstly if there + in address order and thus when a FREE() occurs we know instantly if there are FREE CHUNKS wall-to-wall. No list "travels" needed. Requires some extra space in every allocated BLOCK. Still needs to put the new CHUNK in the right place in size-sorted list/tree. All memory areas, allocated or not, contain the following header: - - size of this memory area - - FREE status - - pointer to the next AREA closest in memory - - pointer to the prev AREA closest in memory - (12 bytes) + - size of this memory area (31 bits) + - FREE status (1 bit) + - pointer to the next AREA closest in memory (32 bits) + - pointer to the prev AREA closest in memory (32 bits) + (Totally 12 bytes) * Sort all FREE CHUNKS in size-order. We use a SPLAY TREE algorithm for maximum speed. Data/structs used for the size-sorting functions are kept @@ -154,7 +154,7 @@ MEMORY SYSTEM REALLOC - * There IS NO realloc() of large blocks, they are performed in the higher + * There IS NO realloc() of large blocks, they are performed in the previous layer (dmalloc). diff --git a/firmware/test/malloc/bmalloc.c b/firmware/malloc/bmalloc.c similarity index 91% rename from firmware/test/malloc/bmalloc.c rename to firmware/malloc/bmalloc.c index e22147a61c..c83bd09628 100644 --- a/firmware/test/malloc/bmalloc.c +++ b/firmware/malloc/bmalloc.c @@ -1,3 +1,21 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ /***************************************************************************** * * Big (best-fit) Memory Allocation @@ -128,7 +146,7 @@ void add_blocktolists(struct BlockInfo *block, /* yes, we are wall-to-wall with the higher CHUNK */ if(temp->info&INFO_FREE) { /* and the neighbour is even free, remove that one and enlarge - ourselves, call add_pool() recursively and then escape */ + ourselves, call add_blocktolists() recursively and then escape */ remove_block(temp); /* unlink 'temp' from list */ diff --git a/firmware/malloc/bmalloc.h b/firmware/malloc/bmalloc.h new file mode 100644 index 0000000000..b97236dccf --- /dev/null +++ b/firmware/malloc/bmalloc.h @@ -0,0 +1,24 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +int bmalloc_add_pool(void *start, size_t size); +void bmalloc_status(void); + +void *bmalloc(size_t size); +void bfree(void *ptr); + diff --git a/firmware/test/malloc/bysize.c b/firmware/malloc/bysize.c similarity index 91% rename from firmware/test/malloc/bysize.c rename to firmware/malloc/bysize.c index 9ab1ffef9e..c8e2759cec 100644 --- a/firmware/test/malloc/bysize.c +++ b/firmware/malloc/bysize.c @@ -1,3 +1,21 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ /***************************************************************************** * * Size-sorted list/tree functions. @@ -5,8 +23,7 @@ * Author: Daniel Stenberg * Date: March 7, 1997 * Version: 2.0 - * Email: Daniel.Stenberg@sth.frontec.se - * + * Email: daniel@haxx.se * * v2.0 * - Added SPLAY TREE functionality. diff --git a/firmware/malloc/bysize.h b/firmware/malloc/bysize.h new file mode 100644 index 0000000000..c4621328bf --- /dev/null +++ b/firmware/malloc/bysize.h @@ -0,0 +1,24 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ +void bmalloc_remove_chunksize(void *data); +void bmalloc_insert_bysize(char *data, size_t size); +char *bmalloc_obtainbysize( size_t size); +#ifdef DEBUG +void bmalloc_print_sizes(void); +#endif diff --git a/firmware/test/malloc/dmalloc.c b/firmware/malloc/dmalloc.c similarity index 94% rename from firmware/test/malloc/dmalloc.c rename to firmware/malloc/dmalloc.c index c7ad9e88f9..cfb250827b 100644 --- a/firmware/test/malloc/dmalloc.c +++ b/firmware/malloc/dmalloc.c @@ -1,3 +1,21 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ /***************************************************************************** * * Dynamic small-blocks Memory Allocation @@ -22,6 +40,8 @@ #include /* makes the PSOS complain on the 'size_t' typedef */ #endif +#define BMALLOC /* we use our own big-malloc system */ + #ifdef BMALLOC #include "bmalloc.h" #endif @@ -132,8 +152,7 @@ struct MemInfo { /* a little 'bc' script that helps us maximize the usage: - for 32-bit aligned addresses (SPARC crashes otherwise): - for(i=20; i<2040; i++) { a=4064/i; if(a*i >= 4060) { if(i%4==0) {i;} } } - + for(i=20; i<2040; i+=4) { a=4064/i; if(a*i >= 4060) { {i;} } } I try to approximate a double of each size, starting with ~20. We don't do ODD sizes since several CPU flavours dump core when accessing such @@ -141,9 +160,9 @@ struct MemInfo { happy with us. */ -short qinfo[]= { 20, 28, 52, 116, 312, 580, 1016, 2032}; -/* 52 and 312 only make use of 4056 bytes, but without them there are too - wide gaps */ +const static short qinfo[]= { + 20, 28, 52, 116, 312, 580, 1016, 2032 +}; #define MIN(x,y) ((x)<(y)?(x):(y)) diff --git a/firmware/malloc/dmalloc.h b/firmware/malloc/dmalloc.h new file mode 100644 index 0000000000..a4e0ab4f6b --- /dev/null +++ b/firmware/malloc/dmalloc.h @@ -0,0 +1,35 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Daniel Stenberg + * + * All files in this archive are subject to the GNU General Public License. + * See the file COPYING in the source tree root for full license agreement. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +void *dmalloc(size_t); +void dfree(void *); +void *drealloc(void *, size_t); + +#define malloc(x) dmalloc(x) +#define free(x) dfree(x) +#define realloc(x,y) drealloc(x,y) +#define calloc(x,y) dcalloc(x,y) + + +/* use this to intialize the internals of the dmalloc engine */ +void dmalloc_initialize(void); + +#ifdef DEBUG +void dmalloc_status(void); +#endif diff --git a/firmware/test/malloc/Makefile b/firmware/test/malloc/Makefile index 4930e0f201..c7fdedb499 100644 --- a/firmware/test/malloc/Makefile +++ b/firmware/test/malloc/Makefile @@ -1,8 +1,4 @@ -TARGET = libdmalloc.a - -LIBOBJS = dmalloc.o bmalloc.o bysize.o - OBJS1 = mytest.o TARGET1 = mytest @@ -14,20 +10,17 @@ TARGET3 = dmytest # define this to talk a lot in runtime # -DDEBUG_VERBOSE -CFLAGS = -g -DUNIX -DBMALLOC -Wall -DDEBUG +CFLAGS = -g -Wall -DDEBUG -I../../malloc CC = gcc AR = ar -LDFLAGS = -L. -ldmalloc +LDFLAGS = -L../../malloc -ldmalloc -all: $(TARGET) $(TARGET1) $(TARGET2) $(TARGET3) +all: $(TARGET1) $(TARGET2) $(TARGET3) clean: - rm -f core *~ $(TARGET) $(TARGET1) $(TARGET2) $(TARGET3) \ - $(LIBOBJS) $(OBJS1) $(OBJS2) $(OBJS3) - -$(TARGET): $(LIBOBJS) - $(AR) ruv $(TARGET) $(LIBOBJS) + rm -f core *~ $(TARGET1) $(TARGET2) $(TARGET3) \ + $(OBJS1) $(OBJS2) $(OBJS3) $(TARGET1): $(OBJS1) $(CC) -g -o $(TARGET1) $(OBJS1) $(LDFLAGS) @@ -38,14 +31,6 @@ $(TARGET2): $(OBJS2) $(TARGET3): $(OBJS3) $(CC) -g -o $(TARGET3) $(OBJS3) $(LDFLAGS) -bmalloc.o: bmalloc.c bysize.h -bysize.o: bysize.c -dmalloc.o: dmalloc.c -dmytest.o: dmytest.c dmalloc.h bmalloc.h +dmytest.o: dmytest.c Malloc.o: Malloc.c -mytest.o: mytest.c bmalloc.h - -tgz: - @(dir=`pwd`;name=`basename $$dir`;echo Creates $$name.tar.gz; cd .. ; \ - tar -cf $$name.tar `cat $$name/FILES | sed "s:^/:$$name/:g"` ; \ - gzip $$name.tar ; chmod a+r $$name.tar.gz ; mv $$name.tar.gz $$name/) +mytest.o: mytest.c diff --git a/firmware/test/malloc/Malloc.c b/firmware/test/malloc/Malloc.c index cfc7301d8f..63239fe2ab 100644 --- a/firmware/test/malloc/Malloc.c +++ b/firmware/test/malloc/Malloc.c @@ -26,7 +26,7 @@ kommentaren p */ -/*#undef BMALLOC*/ +#define BMALLOC /* go go go */ #ifdef BMALLOC #include "dmalloc.h" @@ -162,7 +162,7 @@ int main(void) } output: if (out_of_memory || !(count%DISPLAY_WHEN)) { - printf("(%d) malloc %d, realloc %d, free %d, total size %d\n", + printf("(%ld) malloc %ld, realloc %ld, free %ld, total size %ld\n", count, count_malloc, count_realloc, count_free, total_memory); { int count; @@ -175,7 +175,7 @@ int main(void) } if (out_of_memory) { if(out_of_memory) - printf("Couldn't get %d bytes\n", out_of_memory); + printf("Couldn't get %ld bytes\n", out_of_memory); dmalloc_status(); bmalloc_status(); diff --git a/firmware/test/malloc/bmalloc.h b/firmware/test/malloc/bmalloc.h deleted file mode 100644 index 8f26615107..0000000000 --- a/firmware/test/malloc/bmalloc.h +++ /dev/null @@ -1,6 +0,0 @@ -int bmalloc_add_pool(void *start, size_t size); -void bmalloc_status(void); - -void *bmalloc(size_t size); -void bfree(void *ptr); - diff --git a/firmware/test/malloc/bysize.h b/firmware/test/malloc/bysize.h deleted file mode 100644 index e14422810f..0000000000 --- a/firmware/test/malloc/bysize.h +++ /dev/null @@ -1,6 +0,0 @@ -void bmalloc_remove_chunksize(void *data); -void bmalloc_insert_bysize(char *data, size_t size); -char *bmalloc_obtainbysize( size_t size); -#ifdef DEBUG -void bmalloc_print_sizes(void); -#endif diff --git a/firmware/test/malloc/dmalloc.h b/firmware/test/malloc/dmalloc.h deleted file mode 100644 index 05a9883a4c..0000000000 --- a/firmware/test/malloc/dmalloc.h +++ /dev/null @@ -1,13 +0,0 @@ - -void *dmalloc(size_t); -void dfree(void *); -void *drealloc(void *, size_t); - -#define malloc(x) dmalloc(x) -#define free(x) dfree(x) -#define realloc(x,y) drealloc(x,y) -#define calloc(x,y) dcalloc(x,y) - - -/* use this to intialize the internals of the dmalloc engine */ -void dmalloc_initialize(void);