diff options
| -rw-r--r-- | src/Makefile | 6 | ||||
| -rw-r--r-- | src/allocators/speedymalloc.py | 29 | ||||
| -rw-r--r-- | src/speedymalloc.c | 259 |
3 files changed, 293 insertions, 1 deletions
diff --git a/src/Makefile b/src/Makefile index bd3b791..2d94a9f 100644 --- a/src/Makefile +++ b/src/Makefile @@ -14,7 +14,7 @@ MEMSIZE_KB=$(shell free -t | tail -1 | tr -s ' ' | cut -d ' ' -f 2) MEMSIZE=$(shell echo $(MEMSIZE_KB)"* 1024" | bc) TOOLS = print_status_on_exit.so exec -ALLOCS = chattymalloc.so bumpptr_alloc.so +ALLOCS = chattymalloc.so bumpptr_alloc.so speedymalloc.so TARGETS = $(addprefix $(OBJDIR)/allocators/,$(ALLOCS)) $(addprefix $(OBJDIR)/,$(TOOLS)) .PHONY: all clean @@ -25,6 +25,10 @@ $(OBJDIR)/allocators/bumpptr_alloc.so: bumpptr_alloc.c Makefile @if test \( ! \( -d $(@D) \) \) ;then mkdir -p $(@D);fi $(CC) $(LDFLAGS) -shared -DMEMSIZE=$(MEMSIZE) $(CFLAGS) -o $@ $< +$(OBJDIR)/allocators/speedymalloc.so: speedymalloc.c Makefile + @if test \( ! \( -d $(@D) \) \) ;then mkdir -p $(@D);fi + $(CC) $(LDFLAGS) -shared -DMEMSIZE=$(MEMSIZE) $(CFLAGS) -o $@ $< + $(OBJDIR)/allocators/chattymalloc.so: chattymalloc.c Makefile @if test \( ! \( -d $(@D) \) \) ;then mkdir -p $(@D);fi $(CC) $(LDFLAGS) -shared $(CFLAGS) -o $@ $< -ldl diff --git a/src/allocators/speedymalloc.py b/src/allocators/speedymalloc.py new file mode 100644 index 0000000..9df3d7d --- /dev/null +++ b/src/allocators/speedymalloc.py @@ -0,0 +1,29 @@ +# Copyright 2018-2019 Florian Fischer <florian.fl.fischer@fau.de> +# +# This file is part of allocbench. +# +# allocbench is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# allocbench 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 allocbench. If not, see <http://www.gnu.org/licenses/>. + +"""Bumpptr allocator + +The bumpptr allocator makes the biggest possible tradeoff between speed and +memory in speeds favor. Memory is mmapped per thread and never freed. +See src/bumpptr.c for the actual implementation. +""" + +import os +from src.allocator import Allocator, BUILDDIR + +speedymalloc = Allocator("speedymalloc", LD_PRELOAD=os.path.join(BUILDDIR, "speedymalloc.so"), + color="xkcd:dark") diff --git a/src/speedymalloc.c b/src/speedymalloc.c new file mode 100644 index 0000000..89e9548 --- /dev/null +++ b/src/speedymalloc.c @@ -0,0 +1,259 @@ +#include <assert.h> +#include <errno.h> +#include <stddef.h> /* NULL, size_t */ +#include <stdint.h> /* uintptr_t */ +#include <stdio.h> /* fprintf */ +#include <stdlib.h> /* exit */ +#include <unistd.h> /* sysconf(_SC_PAGESIZE) */ +#include <string.h> /* memset */ +#include <sys/mman.h> /* mmap */ + +#define MIN_ALIGNMENT 16 + +#ifndef MEMSIZE +#define MEMSIZE 1024*4*1024*1024l +#endif + +// sizeof(tls_t) == 4096 +#define CACHE_BINS 511 +// max cached object: 511 * 64 - 1 = 32703 +#define CACHE_BIN_SEPERATION 64 + +#define unlikely(x) __builtin_expect((x),0) + +#ifdef __cplusplus +extern "C" { +#endif + + +typedef struct chunk { + size_t size; // Size header field for internal use + struct chunk* next; +} chunk_t; + +static inline chunk_t* ptr2chunk(void* ptr) { + return (chunk_t*)((uintptr_t)ptr - sizeof(size_t)); +} + +static inline void* chunk2ptr (chunk_t* chunk) { + return (void*)((uintptr_t)chunk + sizeof(size_t)); +} + +typedef struct TLStates { + uintptr_t ptr; + chunk_t* bins[CACHE_BINS]; +} tls_t; + +__thread tls_t* tls; + +static inline int size2bin(size_t size) { + assert(size > 0 && size < CACHE_BINS * CACHE_BIN_SEPERATION); + return (size - 1) / CACHE_BIN_SEPERATION; +} + +static inline size_t bin2size(int bin) { + assert(bin >= 0 && bin < CACHE_BINS); + return (bin + 1) * CACHE_BIN_SEPERATION; +} + +static void init_tls(void) { + void *mem = mmap(NULL, MEMSIZE, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); + if (mem == MAP_FAILED) { + perror("mmap"); + exit(1); + } + tls = (tls_t*)mem; + + tls->ptr = ((uintptr_t)tls) + sizeof(tls_t); +} + +static void* bump_alloc(size_t size) { + // allocate size header + tls->ptr += sizeof(size_t); + + // align ptr + size_t mask = MIN_ALIGNMENT -1; + tls->ptr = (tls->ptr + mask) & ~mask; + + void* ptr = (void*)tls->ptr; + ptr2chunk(ptr)->size = size; + tls->ptr += size; + + return ptr; +} + +void* malloc(size_t size) { + if (unlikely(tls == NULL)) { + init_tls(); + } + + // cached sizes + if (size < CACHE_BINS * CACHE_BIN_SEPERATION) { + int bin = size2bin(size); + if (tls->bins[bin] != NULL) { + chunk_t* chunk = tls->bins[bin]; + // remove first chunk from list + tls->bins[bin] = chunk->next; + return chunk2ptr(chunk); + } + return bump_alloc(bin2size(bin)); + } + + return bump_alloc(size); +} + +void free(void* ptr) { + if (unlikely(tls == NULL)) { + init_tls(); + } + + if (ptr == NULL) { + return; + } + + chunk_t* chunk = ptr2chunk(ptr); + + if (chunk->size < CACHE_BINS * CACHE_BIN_SEPERATION) { + int bin = size2bin(chunk->size); + chunk->next = tls->bins[bin]; + tls->bins[bin] = chunk; + } +} + +void* realloc(void* ptr, size_t size) { + if (ptr == NULL) { + return malloc(size); + } + + if (size == 0) { + return NULL; + } + + void* new_ptr = malloc(size); + size_t to_copy = ptr2chunk(ptr)->size; + memcpy(new_ptr, ptr, to_copy); + return new_ptr; +} + +void* memalign(size_t alignment, size_t size) { + /* if not power of two */ + if (!((alignment != 0) && !(alignment & (alignment - 1)))) { + return NULL; + } + + if (unlikely(tls == NULL)) { + init_tls(); + } + + // allocate size header + tls->ptr += sizeof(size_t); + + // align returned pointer + size_t mask = alignment - 1; + tls->ptr = (tls->ptr + mask) & ~mask; + + void* ptr = (void*)tls->ptr; + ptr2chunk(ptr)->size = size; + tls->ptr += size; + + return ptr; +} + +int posix_memalign(void **memptr, size_t alignment, size_t size) +{ + void *out; + + if (memptr == NULL) { + return 22; + } + + if ((alignment % sizeof(void*)) != 0) { + return 22; + } + + /* if not power of two */ + if (!((alignment != 0) && !(alignment & (alignment - 1)))) { + return 22; + } + + if (size == 0) { + *memptr = NULL; + return 0; + } + + out = memalign(alignment, size); + if (out == NULL) { + return 12; + } + + *memptr = out; + return 0; +} + +void* calloc(size_t nmemb, size_t size) +{ + void *out; + size_t fullsize = nmemb * size; + + if ((size != 0) && ((fullsize / size) != nmemb)) { + return NULL; + } + + out = malloc(fullsize); + if (out != NULL) + memset(out, 0, fullsize); + + return out; +} + +void* valloc(size_t size) +{ + long ret = sysconf(_SC_PAGESIZE); + if (ret == -1) { + return NULL; + } + + return memalign(ret, size); +} + +void* pvalloc(size_t size) +{ + size_t ps, rem, allocsize; + + long ret = sysconf(_SC_PAGESIZE); + if (ret == -1) { + return NULL; + } + + ps = ret; + rem = size % ps; + allocsize = size; + if (rem != 0) { + allocsize = ps + (size - rem); + } + + return memalign(ps, allocsize); +} + +void* aligned_alloc(size_t alignment, size_t size) +{ + if (alignment > size) { + return NULL; + } + + if ((size % alignment) != 0) { + return NULL; + } + + return memalign(alignment, size); +} + +int malloc_stats() { + fprintf(stderr, "Bump pointer allocator by muhq\n"); + fprintf(stderr, "Memsize: %zu, start address: %p, bump pointer %p\n", MEMSIZE, &tls, tls->ptr); + return 0; +} + +#ifdef __cplusplus +} +#endif |
