fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-04-24 23:02:14 +00:00
Code Issues Projects Releases Wiki Activity

fix unsorted bin problem

Browse Source
This commit is contained in:
vms 2019-04-02 02:04:15 +03:00
parent 4d66a5607e
commit 9cdf2f77d5
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/malloc/malloc.c
View File

@ -284,6 +284,34 @@ static void trim(struct chunk *self, size_t n)
__bin_chunk(split); __bin_chunk(split);
} }
// returns chunk which size is more then given n from the 64-th unsorted bin
// if there is no suitable chunk returns 0
static struct chunk *get_chunk_from_unsorted_bin(size_t n)
{
const int unsorted_bin_id = 63;
struct chunk *current = 0;
lock_bin(unsorted_bin_id);
current = mal.bins[unsorted_bin_id].head;
while(current != 0 && current != mal.bins[unsorted_bin_id].tail) {
// it is a the first-fit strategy
if(current->csize >= n) {
if (!pretrim(current, n, unsorted_bin_id, unsorted_bin_id)) {
unbin(current, unsorted_bin_id);
}
unlock_bin(unsorted_bin_id);
return current;
}
current = current->next;
}
unlock_bin(unsorted_bin_id);
return 0;
}
void *malloc(size_t n) void *malloc(size_t n)
{ {
struct chunk *c; struct chunk *c;
@ -294,7 +322,7 @@ void *malloc(size_t n)
if (n > MMAP_THRESHOLD) { if (n > MMAP_THRESHOLD) {
size_t len = n + OVERHEAD + PAGE_SIZE - 1 & -PAGE_SIZE; size_t len = n + OVERHEAD + PAGE_SIZE - 1 & -PAGE_SIZE;
char *base = __mmap(0, len, PROT_READ|PROT_WRITE, char *base = __mmap(0, len, PROT_READ|PROT_WRITE,
MAP_PRIVATE|MAP_ANONYMOUS, -1, 0); MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
if (base == (void *)-1) return 0; if (base == (void *)-1) return 0;
c = (void *)(base + SIZE_ALIGN - OVERHEAD); c = (void *)(base + SIZE_ALIGN - OVERHEAD);
c->csize = len - (SIZE_ALIGN - OVERHEAD); c->csize = len - (SIZE_ALIGN - OVERHEAD);
@ -305,17 +333,25 @@ void *malloc(size_t n)
i = bin_index_up(n); i = bin_index_up(n);
for (;;) { for (;;) {
uint64_t mask = mal.binmap & -(1ULL<<i); uint64_t mask = mal.binmap & -(1ULL<<i);
if (!mask) { if (i == 64) {
c = get_chunk_from_unsorted_bin(n);
if(c != 0) {
break;
}
}
if (i == 64 || !mask) {
c = expand_heap(n); c = expand_heap(n);
if (!c) return 0; if (!c) return 0;
if (alloc_rev(c)) { if (alloc_rev(c)) {
struct chunk *x = c; struct chunk *x = c;
c = PREV_CHUNK(c); c = PREV_CHUNK(c);
NEXT_CHUNK(x)->psize = c->csize = NEXT_CHUNK(x)->psize = c->csize =
x->csize + CHUNK_SIZE(c); x->csize + CHUNK_SIZE(c);
} }
break; break;
} }
j = first_set(mask); j = first_set(mask);
lock_bin(j); lock_bin(j);
c = mal.bins[j].head; c = mal.bins[j].head;