niansa-misc/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-06 20:48:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

avoid over-allocation of brk on first malloc

Browse source 
if init_malloc returns positive (successful first init), malloc will
retry getting a chunk from the free bins rather than expanding the
heap again. also pass init_malloc a hint for the size of the initial
allocation.
This commit is contained in:
Rich Felker 2011-04-01 23:07:03 -04:00
parent 952987a0cb
commit bf8785825a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/malloc/malloc.c
View file

@ -179,7 +179,7 @@ fail:
return 0; return 0;
} }
static int init_malloc() static int init_malloc(size_t n)
{ {
static int init, waiters; static int init, waiters;
int state; int state;
@ -196,7 +196,7 @@ static int init_malloc()
mal.brk = __brk(0) + 2*SIZE_ALIGN-1 & -SIZE_ALIGN; mal.brk = __brk(0) + 2*SIZE_ALIGN-1 & -SIZE_ALIGN;
c = expand_heap(1); c = expand_heap(n);
if (!c) { if (!c) {
a_store(&init, 0); a_store(&init, 0);
@ -210,7 +210,7 @@ static int init_malloc()
a_store(&init, 2); a_store(&init, 2);
if (waiters) __wake(&init, -1, 1); if (waiters) __wake(&init, -1, 1);
return 0; return 1;
} }
static int adjust_size(size_t *n) static int adjust_size(size_t *n)
@ -347,7 +347,7 @@ void *malloc(size_t n)
for (;;) { for (;;) {
uint64_t mask = mal.binmap & -(1ULL<<i); uint64_t mask = mal.binmap & -(1ULL<<i);
if (!mask) { if (!mask) {
init_malloc(); if (init_malloc(n) > 0) continue;
c = expand_heap(n); c = expand_heap(n);
if (!c) return 0; if (!c) return 0;
if (alloc_rev(c)) { if (alloc_rev(c)) {