diff options
| -rw-r--r-- | common/Kconfig | 3 | ||||
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/memory.c | 8 | ||||
| -rw-r--r-- | common/tlsf_malloc.c | 78 |
4 files changed, 91 insertions, 0 deletions
diff --git a/common/Kconfig b/common/Kconfig index 1c9e398447..f8df3dd358 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -159,6 +159,9 @@ choice config MALLOC_DLMALLOC bool "dlmalloc" +config MALLOC_TLSF + bool "tlsf" + config MALLOC_DUMMY bool "dummy malloc" depends on SHELL_NONE diff --git a/common/Makefile b/common/Makefile index e02650ba4c..a53d37a421 100644 --- a/common/Makefile +++ b/common/Makefile @@ -13,6 +13,8 @@ obj-$(CONFIG_OFTREE) += oftree.o obj-y += memory.o obj-$(CONFIG_MALLOC_DLMALLOC) += dlmalloc.o +obj-$(CONFIG_MALLOC_TLSF) += tlsf_malloc.o +obj-$(CONFIG_MALLOC_TLSF) += tlsf.o obj-$(CONFIG_MALLOC_DUMMY) += dummy_malloc.o obj-y += clock.o obj-y += version.o diff --git a/common/memory.c b/common/memory.c index f0ae1ccbaf..faff33b419 100644 --- a/common/memory.c +++ b/common/memory.c @@ -47,11 +47,19 @@ unsigned long mem_malloc_end(void) return malloc_end; } +#ifdef CONFIG_MALLOC_TLSF +#include <tlsf.h> +tlsf_pool tlsf_mem_pool; +#endif + void mem_malloc_init(void *start, void *end) { malloc_start = (unsigned long)start; malloc_end = (unsigned long)end; malloc_brk = malloc_start; +#ifdef CONFIG_MALLOC_TLSF + tlsf_mem_pool = tlsf_create(start, (char *)end - (char *)start); +#endif } #ifndef __SANDBOX__ diff --git a/common/tlsf_malloc.c b/common/tlsf_malloc.c new file mode 100644 index 0000000000..a6f82ba58d --- /dev/null +++ b/common/tlsf_malloc.c @@ -0,0 +1,78 @@ +/* + * tlsf wrapper for barebox + * + * Copyright (C) 2011 Antony Pavlov <antonynpavlov@gmail.com> + * + * This file is part of barebox. + * See file CREDITS for list of people who contributed to this project. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <config.h> +#include <malloc.h> +#include <string.h> +#include <malloc.h> + +#include <stdio.h> +#include <module.h> +#include <tlsf.h> + +extern tlsf_pool tlsf_mem_pool; + +void *malloc(size_t bytes) +{ + return tlsf_malloc(tlsf_mem_pool, bytes); +} +EXPORT_SYMBOL(malloc); + +/* + * calloc calls malloc, then zeroes out the allocated chunk. + */ +void *calloc(size_t n, size_t elem_size) +{ + void *mem; + size_t sz; + + sz = n * elem_size; + mem = malloc(sz); + memset(mem, 0, sz); + + return mem; +} +EXPORT_SYMBOL(calloc); + +void free(void *mem) +{ + tlsf_free(tlsf_mem_pool, mem); +} +EXPORT_SYMBOL(free); + +void *realloc(void *oldmem, size_t bytes) +{ + return tlsf_realloc(tlsf_mem_pool, oldmem, bytes); +} +EXPORT_SYMBOL(realloc); + +void *memalign(size_t alignment, size_t bytes) +{ + return tlsf_memalign(tlsf_mem_pool, alignment, bytes); +} +EXPORT_SYMBOL(memalign); + +#ifdef CONFIG_CMD_MEMINFO +void malloc_stats(void) +{ +} +#endif /* CONFIG_CMD_MEMINFO */ |