diff options
Diffstat (limited to 'src/malloc')
| -rw-r--r-- | src/malloc/DESIGN | 22 | ||||
| -rw-r--r-- | src/malloc/__brk.c | 7 | ||||
| -rw-r--r-- | src/malloc/__simple_malloc.c | 44 | ||||
| -rw-r--r-- | src/malloc/calloc.c | 23 | ||||
| -rw-r--r-- | src/malloc/malloc.c | 515 | ||||
| -rw-r--r-- | src/malloc/memalign.c | 13 | ||||
| -rw-r--r-- | src/malloc/posix_memalign.c | 47 | 
7 files changed, 671 insertions, 0 deletions
| diff --git a/src/malloc/DESIGN b/src/malloc/DESIGN new file mode 100644 index 00000000..58b0523f --- /dev/null +++ b/src/malloc/DESIGN @@ -0,0 +1,22 @@ + + +In principle, this memory allocator is roughly equivalent to Doug +Lea's dlmalloc with fine-grained locking. + + + +malloc: + +Uses a freelist binned by chunk size, with a bitmap to optimize +searching for the smallest non-empty bin which can satisfy an +allocation. If no free chunks are available, it creates a new chunk of +the requested size and attempts to merge it with any existing free +chunk immediately below the newly created chunk. + +Whether the chunk was obtained from a bin or newly created, it's +likely to be larger than the requested allocation. malloc always +finishes its work by passing the new chunk to realloc, which will +split it into two chunks and free the tail portion. + + + diff --git a/src/malloc/__brk.c b/src/malloc/__brk.c new file mode 100644 index 00000000..e3b3af31 --- /dev/null +++ b/src/malloc/__brk.c @@ -0,0 +1,7 @@ +#include <stdint.h> +#include "syscall.h" + +uintptr_t __brk(uintptr_t newbrk) +{ +	return syscall1(__NR_brk, newbrk); +} diff --git a/src/malloc/__simple_malloc.c b/src/malloc/__simple_malloc.c new file mode 100644 index 00000000..49b74c8e --- /dev/null +++ b/src/malloc/__simple_malloc.c @@ -0,0 +1,44 @@ +#include <stdlib.h> +#include <stdint.h> +#include <limits.h> +#include <errno.h> +#include "libc.h" + +uintptr_t __brk(uintptr_t); + +#define ALIGN 16 + +void *__simple_malloc(size_t n) +{ +	static uintptr_t cur, brk; +	uintptr_t base, new; +	static int lock; +	size_t align=1; + +	if (n < SIZE_MAX - ALIGN) +		while (align<n && align<ALIGN) +			align += align; +	n = n + align - 1 & -align; + +	LOCK(&lock); +	if (!cur) cur = brk = __brk(0)+16; +	if (n > SIZE_MAX - brk) goto fail; + +	base = cur + align-1 & -align; +	if (base+n > brk) { +		new = base+n + PAGE_SIZE-1 & -PAGE_SIZE; +		if (__brk(new) != new) goto fail; +		brk = new; +	} +	cur = base+n; +	UNLOCK(&lock); + +	return (void *)base; + +fail: +	UNLOCK(&lock); +	errno = ENOMEM; +	return 0; +} + +weak_alias(__simple_malloc, malloc); diff --git a/src/malloc/calloc.c b/src/malloc/calloc.c new file mode 100644 index 00000000..9d574562 --- /dev/null +++ b/src/malloc/calloc.c @@ -0,0 +1,23 @@ +#include <stdlib.h> +#include <errno.h> +#include <string.h> + +void *calloc(size_t m, size_t n) +{ +	void *p; +	size_t *z; +	if (n && m > (size_t)-1/n) { +		errno = ENOMEM; +		return 0; +	} +	n *= m; +	p = malloc(n); +	if (!p) return 0; +	/* Only do this for non-mmapped chunks */ +	if (((size_t *)p)[-1] & 7) { +		/* Only write words that are not already zero */ +		m = (n + sizeof *z - 1)/sizeof *z; +		for (z=p; m; m--, z++) if (*z) *z=0; +	} +	return p; +} diff --git a/src/malloc/malloc.c b/src/malloc/malloc.c new file mode 100644 index 00000000..d9a30fe4 --- /dev/null +++ b/src/malloc/malloc.c @@ -0,0 +1,515 @@ +#include <stdlib.h> +#include <string.h> +#include <limits.h> +#include <stdint.h> +#include <errno.h> +#include <sys/mman.h> +#include "libc.h" +#include "atomic.h" +#include "pthread_impl.h" + +uintptr_t __brk(uintptr_t); +void *__mmap(void *, size_t, int, int, int, off_t); +int __munmap(void *, size_t); +void *__mremap(void *, size_t, size_t, int, ...); +int __madvise(void *, size_t, int); + +struct chunk { +	size_t data[1]; +	struct chunk *next; +	struct chunk *prev; +}; + +struct bin { +	int lock[2]; +	struct chunk *head; +	struct chunk *tail; +}; + +static struct { +	uintptr_t brk; +	size_t *heap; +	uint64_t binmap; +	struct bin bins[64]; +	int brk_lock[2]; +	int free_lock[2]; +} mal; + + +#define SIZE_ALIGN (4*sizeof(size_t)) +#define SIZE_MASK (-SIZE_ALIGN) +#define OVERHEAD (2*sizeof(size_t)) +#define MMAP_THRESHOLD (0x1c00*SIZE_ALIGN) +#define DONTCARE 16 +#define RECLAIM 163840 + +#define CHUNK_SIZE(c) ((c)->data[0] & SIZE_MASK) +#define CHUNK_PSIZE(c) ((c)->data[-1] & SIZE_MASK) +#define PREV_CHUNK(c) ((struct chunk *)((char *)(c) - CHUNK_PSIZE(c))) +#define NEXT_CHUNK(c) ((struct chunk *)((char *)(c) + CHUNK_SIZE(c))) +#define MEM_TO_CHUNK(p) (struct chunk *)((size_t *)p - 1) +#define CHUNK_TO_MEM(c) (void *)((c)->data+1) +#define BIN_TO_CHUNK(i) (MEM_TO_CHUNK(&mal.bins[i].head)) + +#define C_INUSE  ((size_t)1) +#define C_FLAGS  ((size_t)3) +#define C_SIZE   SIZE_MASK + +#define IS_MMAPPED(c) !((c)->data[0] & (C_INUSE)) + + +/* Synchronization tools */ + +static void lock(volatile int *lk) +{ +	if (!libc.threads_minus_1) return; +	while(a_swap(lk, 1)) __wait(lk, lk+1, 1, 1); +} + +static void unlock(volatile int *lk) +{ +	if (!libc.threads_minus_1) return; +	a_store(lk, 0); +	if (lk[1]) __wake(lk, 1, 1); +} + +static void lock_bin(int i) +{ +	if (libc.threads_minus_1) +		lock(mal.bins[i].lock); +	if (!mal.bins[i].head) +		mal.bins[i].head = mal.bins[i].tail = BIN_TO_CHUNK(i); +} + +static void unlock_bin(int i) +{ +	if (!libc.threads_minus_1) return; +	unlock(mal.bins[i].lock); +} + +static int first_set(uint64_t x) +{ +#if 1 +	return a_ctz_64(x); +#else +	static const char debruijn64[64] = { +		0, 1, 2, 53, 3, 7, 54, 27, 4, 38, 41, 8, 34, 55, 48, 28, +		62, 5, 39, 46, 44, 42, 22, 9, 24, 35, 59, 56, 49, 18, 29, 11, +		63, 52, 6, 26, 37, 40, 33, 47, 61, 45, 43, 21, 23, 58, 17, 10, +		51, 25, 36, 32, 60, 20, 57, 16, 50, 31, 19, 15, 30, 14, 13, 12 +	}; +	static const char debruijn32[32] = { +		0, 1, 23, 2, 29, 24, 19, 3, 30, 27, 25, 11, 20, 8, 4, 13, +		31, 22, 28, 18, 26, 10, 7, 12, 21, 17, 9, 6, 16, 5, 15, 14 +	}; +	if (sizeof(long) < 8) { +		uint32_t y = x; +		if (!y) { +			y = x>>32; +			return 32 + debruijn32[(y&-y)*0x076be629 >> 27]; +		} +		return debruijn32[(y&-y)*0x076be629 >> 27]; +	} +	return debruijn64[(x&-x)*0x022fdd63cc95386dull >> 58]; +#endif +} + +static int bin_index(size_t x) +{ +	x = x / SIZE_ALIGN - 1; +	if (x <= 32) return x; +	if (x > 0x1c00) return 63; +	return ((union { float v; uint32_t r; }){ x }.r>>21) - 496; +} + +static int bin_index_up(size_t x) +{ +	x = x / SIZE_ALIGN - 1; +	if (x <= 32) return x; +	return ((union { float v; uint32_t r; }){ x }.r+0x1fffff>>21) - 496; +} + +#if 0 +void __dump_heap(int x) +{ +	struct chunk *c; +	int i; +	for (c = (void *)mal.heap; CHUNK_SIZE(c); c = NEXT_CHUNK(c)) +		fprintf(stderr, "base %p size %zu (%d) flags %d/%d\n", +			c, CHUNK_SIZE(c), bin_index(CHUNK_SIZE(c)), +			c->data[0] & 15, +			NEXT_CHUNK(c)->data[-1] & 15); +	for (i=0; i<64; i++) { +		if (mal.bins[i].head != BIN_TO_CHUNK(i) && mal.bins[i].head) { +			fprintf(stderr, "bin %d: %p\n", i, mal.bins[i].head); +			if (!(mal.binmap & 1ULL<<i)) +				fprintf(stderr, "missing from binmap!\n"); +		} else if (mal.binmap & 1ULL<<i) +			fprintf(stderr, "binmap wrongly contains %d!\n", i); +	} +} +#endif + +static struct chunk *expand_heap(size_t n) +{ +	struct chunk *w; +	uintptr_t new; + +	lock(mal.brk_lock); + +	if (n > SIZE_MAX - mal.brk - 2*PAGE_SIZE) goto fail; +	new = mal.brk + n + SIZE_ALIGN + PAGE_SIZE - 1 & -PAGE_SIZE; +	n = new - mal.brk; + +	if (__brk(new) != new) goto fail; + +	w = MEM_TO_CHUNK(new); +	w->data[-1] = n | C_INUSE; +	w->data[0] = 0 | C_INUSE; + +	w = MEM_TO_CHUNK(mal.brk); +	w->data[0] = n | C_INUSE; +	mal.brk = new; +	 +	unlock(mal.brk_lock); + +	return w; +fail: +	unlock(mal.brk_lock); +	return 0; +} + +static int init_malloc() +{ +	static int init, waiters; +	int state; +	struct chunk *c; + +	if (init == 2) return 0; + +	while ((state=a_swap(&init, 1)) == 1) +		__wait(&init, &waiters, 1, 1); +	if (state) { +		a_store(&init, 2); +		return 0; +	} + +	mal.brk = __brk(0) + 2*SIZE_ALIGN-1 & -SIZE_ALIGN; + +	c = expand_heap(1); + +	if (!c) { +		a_store(&init, 0); +		if (waiters) __wake(&init, 1, 1); +		return -1; +	} + +	mal.heap = (void *)c; +	c->data[-1] = 0 | C_INUSE; +	free(CHUNK_TO_MEM(c)); + +	a_store(&init, 2); +	if (waiters) __wake(&init, -1, 1); +	return 0; +} + +static int adjust_size(size_t *n) +{ +	/* Result of pointer difference must fit in ptrdiff_t. */ +	if (*n > PTRDIFF_MAX - SIZE_ALIGN - PAGE_SIZE) { +		errno = ENOMEM; +		return -1; +	} +	*n = (*n + OVERHEAD + SIZE_ALIGN - 1) & SIZE_MASK; +	return 0; +} + +static void unbin(struct chunk *c, int i) +{ +	if (c->prev == c->next) +		a_and_64(&mal.binmap, ~(1ULL<<i)); +	c->prev->next = c->next; +	c->next->prev = c->prev; +	c->data[0] |= C_INUSE; +	NEXT_CHUNK(c)->data[-1] |= C_INUSE; +} + +static int alloc_fwd(struct chunk *c) +{ +	int i; +	size_t k; +	while (!((k=c->data[0]) & C_INUSE)) { +		i = bin_index(k); +		lock_bin(i); +		if (c->data[0] == k) { +			unbin(c, i); +			unlock_bin(i); +			return 1; +		} +		unlock_bin(i); +	} +	return 0; +} + +static int alloc_rev(struct chunk *c) +{ +	int i; +	size_t k; +	while (!((k=c->data[-1]) & C_INUSE)) { +		i = bin_index(k); +		lock_bin(i); +		if (c->data[-1] == k) { +			unbin(PREV_CHUNK(c), i); +			unlock_bin(i); +			return 1; +		} +		unlock_bin(i); +	} +	return 0; +} + + +/* pretrim - trims a chunk _prior_ to removing it from its bin. + * Must be called with i as the ideal bin for size n, j the bin + * for the _free_ chunk self, and bin j locked. */ +static int pretrim(struct chunk *self, size_t n, int i, int j) +{ +	size_t n1; +	struct chunk *next, *split; + +	/* We cannot pretrim if it would require re-binning. */ +	if (j < 40) return 0; +	if (j < i+3) { +		if (j != 63) return 0; +		n1 = CHUNK_SIZE(self); +		if (n1-n <= MMAP_THRESHOLD) return 0; +	} else { +		n1 = CHUNK_SIZE(self); +	} +	if (bin_index(n1-n) != j) return 0; + +	next = NEXT_CHUNK(self); +	split = (void *)((char *)self + n); + +	split->prev = self->prev; +	split->next = self->next; +	split->prev->next = split; +	split->next->prev = split; +	split->data[-1] = n | C_INUSE; +	split->data[0] = n1-n; +	next->data[-1] = n1-n; +	self->data[0] = n | C_INUSE; +	return 1; +} + +static void trim(struct chunk *self, size_t n) +{ +	size_t n1 = CHUNK_SIZE(self); +	struct chunk *next, *split; + +	if (n >= n1 - DONTCARE) return; + +	next = NEXT_CHUNK(self); +	split = (void *)((char *)self + n); + +	split->data[-1] = n | C_INUSE; +	split->data[0] = n1-n | C_INUSE; +	next->data[-1] = n1-n | C_INUSE; +	self->data[0] = n | C_INUSE; + +	free(CHUNK_TO_MEM(split)); +} + +void *malloc(size_t n) +{ +	struct chunk *c; +	int i, j; + +	if (!n || adjust_size(&n) < 0) return 0; + +	if (n > MMAP_THRESHOLD) { +		size_t len = n + PAGE_SIZE - 1 & -PAGE_SIZE; +		char *base = __mmap(0, len, PROT_READ|PROT_WRITE, +			MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); +		if (base == (void *)-1) return 0; +		c = (void *)(base + SIZE_ALIGN - sizeof(size_t)); +		c->data[0] = len - (SIZE_ALIGN - sizeof(size_t)); +		c->data[-1] = SIZE_ALIGN - sizeof(size_t); +		return CHUNK_TO_MEM(c); +	} + +	i = bin_index_up(n); +	for (;;) { +		uint64_t mask = mal.binmap & -(1ULL<<i); +		if (!mask) { +			init_malloc(); +			c = expand_heap(n); +			if (!c) return 0; +			if (alloc_rev(c)) { +				struct chunk *x = c; +				c = PREV_CHUNK(c); +				NEXT_CHUNK(x)->data[-1] = c->data[0] = +					x->data[0] + CHUNK_SIZE(c); +			} +			break; +		} +		j = first_set(mask); +		lock_bin(j); +		c = mal.bins[j].head; +		if (c != BIN_TO_CHUNK(j) && j == bin_index(c->data[0])) { +			if (!pretrim(c, n, i, j)) unbin(c, j); +			unlock_bin(j); +			break; +		} +		unlock_bin(j); +	} + +	/* Now patch up in case we over-allocated */ +	trim(c, n); + +	return CHUNK_TO_MEM(c); +} + +void *realloc(void *p, size_t n) +{ +	struct chunk *self, *next; +	size_t n0, n1; +	void *new; + +	if (!p) return malloc(n); +	else if (!n) return free(p), (void *)0; + +	if (adjust_size(&n) < 0) return 0; + +	self = MEM_TO_CHUNK(p); +	n1 = n0 = CHUNK_SIZE(self); + +	if (IS_MMAPPED(self)) { +		size_t extra = self->data[-1]; +		char *base = (char *)self - extra; +		size_t oldlen = n0 + extra; +		size_t newlen = n + extra; +		if (newlen < PAGE_SIZE && (new = malloc(n))) { +			memcpy(new, p, n-OVERHEAD); +			free(p); +			return new; +		} +		newlen = (newlen + PAGE_SIZE-1) & -PAGE_SIZE; +		if (oldlen == newlen) return p; +		base = __mremap(base, oldlen, newlen, MREMAP_MAYMOVE); +		if (base == (void *)-1) +			return newlen < oldlen ? p : 0; +		self = (void *)(base + extra); +		self->data[0] = newlen - extra; +		return CHUNK_TO_MEM(self); +	} + +	next = NEXT_CHUNK(self); + +	/* Merge adjacent chunks if we need more space. This is not +	 * a waste of time even if we fail to get enough space, because our +	 * subsequent call to free would otherwise have to do the merge. */ +	if (n > n1 && alloc_fwd(next)) { +		n1 += CHUNK_SIZE(next); +		next = NEXT_CHUNK(next); +	} +	/* FIXME: find what's wrong here and reenable it..? */ +	if (0 && n > n1 && alloc_rev(self)) { +		self = PREV_CHUNK(self); +		n1 += CHUNK_SIZE(self); +	} +	self->data[0] = n1 | C_INUSE; +	next->data[-1] = n1 | C_INUSE; + +	/* If we got enough space, split off the excess and return */ +	if (n <= n1) { +		//memmove(CHUNK_TO_MEM(self), p, n0-OVERHEAD); +		trim(self, n); +		return CHUNK_TO_MEM(self); +	} + +	/* As a last resort, allocate a new chunk and copy to it. */ +	new = malloc(n-OVERHEAD); +	if (!new) return 0; +	memcpy(new, p, n0-OVERHEAD); +	free(CHUNK_TO_MEM(self)); +	return new; +} + +void free(void *p) +{ +	struct chunk *self = MEM_TO_CHUNK(p); +	struct chunk *next; +	size_t final_size, new_size, size; +	int reclaim=0; +	int i; + +	if (!p) return; + +	if (IS_MMAPPED(self)) { +		size_t extra = self->data[-1]; +		char *base = (char *)self - extra; +		size_t len = CHUNK_SIZE(self) + extra; +		__munmap(base, len); +		return; +	} + +	final_size = new_size = CHUNK_SIZE(self); +	next = NEXT_CHUNK(self); + +	for (;;) { +		/* Replace middle of large chunks with fresh zero pages */ +		if (reclaim && (self->data[-1] & next->data[0] & C_INUSE)) { +			uintptr_t a = (uintptr_t)self + SIZE_ALIGN+PAGE_SIZE-1 & -PAGE_SIZE; +			uintptr_t b = (uintptr_t)next - SIZE_ALIGN & -PAGE_SIZE; +#if 1 +			__madvise((void *)a, b-a, MADV_DONTNEED); +#else +			__mmap((void *)a, b-a, PROT_READ|PROT_WRITE, +				MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0); +#endif +		} + +		if (self->data[-1] & next->data[0] & C_INUSE) { +			self->data[0] = final_size | C_INUSE; +			next->data[-1] = final_size | C_INUSE; +			i = bin_index(final_size); +			lock_bin(i); +			lock(mal.free_lock); +			if (self->data[-1] & next->data[0] & C_INUSE) +				break; +			unlock(mal.free_lock); +			unlock_bin(i); +		} + +		if (alloc_rev(self)) { +			self = PREV_CHUNK(self); +			size = CHUNK_SIZE(self); +			final_size += size; +			if (new_size+size > RECLAIM && (new_size+size^size) > size) +				reclaim = 1; +		} + +		if (alloc_fwd(next)) { +			size = CHUNK_SIZE(next); +			final_size += size; +			if (new_size+size > RECLAIM && (new_size+size^size) > size) +				reclaim = 1; +			next = NEXT_CHUNK(next); +		} +	} + +	self->data[0] = final_size; +	next->data[-1] = final_size; +	unlock(mal.free_lock); + +	self->next = BIN_TO_CHUNK(i); +	self->prev = mal.bins[i].tail; +	self->next->prev = self; +	self->prev->next = self; + +	if (!(mal.binmap & 1ULL<<i)) +		a_or_64(&mal.binmap, 1ULL<<i); + +	unlock_bin(i); +} diff --git a/src/malloc/memalign.c b/src/malloc/memalign.c new file mode 100644 index 00000000..61f456e4 --- /dev/null +++ b/src/malloc/memalign.c @@ -0,0 +1,13 @@ +#include <stdlib.h> +#include <errno.h> + +void *memalign(size_t align, size_t len) +{ +	void *mem; +	int ret; +	if ((ret = posix_memalign(&mem, align, len))) { +		errno = ret; +		return 0; +	} +	return mem; +} diff --git a/src/malloc/posix_memalign.c b/src/malloc/posix_memalign.c new file mode 100644 index 00000000..ef86260d --- /dev/null +++ b/src/malloc/posix_memalign.c @@ -0,0 +1,47 @@ +#include <stdlib.h> +#include <stdint.h> +#include <errno.h> + +/* This function should work with most dlmalloc-like chunk bookkeeping + * systems, but it's only guaranteed to work with the native implementation + * used in this library. */ + +int posix_memalign(void **res, size_t align, size_t len) +{ +	unsigned char *mem, *new, *end; +	size_t header, footer; + +	if ((align & -align) != align) return EINVAL; +	if (len > SIZE_MAX - align) return ENOMEM; + +	if (align <= 4*sizeof(size_t)) { +		if (!(mem = malloc(len))) +			return errno; +		*res = mem; +		return 0; +	} + +	if (!(mem = malloc(len + align-1))) +		return errno; + +	header = ((size_t *)mem)[-1]; +	end = mem + (header & -8); +	footer = ((size_t *)end)[-2]; +	new = (void *)((uintptr_t)mem + align-1 & -align); + +	if (!(header & 7)) { +		((size_t *)new)[-2] = ((size_t *)mem)[-2] + (new-mem); +		((size_t *)new)[-1] = ((size_t *)mem)[-1] - (new-mem); +		*res = new; +		return 0; +	} + +	((size_t *)mem)[-1] = header&7 | new-mem; +	((size_t *)new)[-2] = footer&7 | new-mem; +	((size_t *)new)[-1] = header&7 | end-new; +	((size_t *)end)[-2] = footer&7 | end-new; + +	if (new != mem) free(mem); +	*res = new; +	return 0; +} | 
