diff options
author | Jason Evans <jasone@canonware.com> | 2016-05-17 21:58:56 (GMT) |
---|---|---|
committer | Jason Evans <jasone@canonware.com> | 2016-06-03 19:27:41 (GMT) |
commit | fc0372a15e6486d69e6f5f4c2b656aafbb013850 (patch) | |
tree | aeb433f4ae8ab1fbc0af6dffa71f44e0dc927bbe /src/arena.c | |
parent | ffa45a53314d3ff4376c753c5609689d0f65f0e8 (diff) | |
download | jemalloc-fc0372a15e6486d69e6f5f4c2b656aafbb013850.zip jemalloc-fc0372a15e6486d69e6f5f4c2b656aafbb013850.tar.gz jemalloc-fc0372a15e6486d69e6f5f4c2b656aafbb013850.tar.bz2 |
Replace extent_tree_szad_* with extent_heap_*.
Diffstat (limited to 'src/arena.c')
-rw-r--r-- | src/arena.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/arena.c b/src/arena.c index faf2349..720219d 100644 --- a/src/arena.c +++ b/src/arena.c @@ -3411,10 +3411,6 @@ arena_new(tsdn_t *tsdn, unsigned ind) arena->nactive = 0; arena->ndirty = 0; - for (i = 0; i < sizeof(arena->runs_avail) / sizeof(arena_run_heap_t); - i++) - arena_run_heap_new(&arena->runs_avail[i]); - qr_new(&arena->runs_dirty, rd_link); qr_new(&arena->chunks_cache, cc_link); @@ -3426,8 +3422,11 @@ arena_new(tsdn_t *tsdn, unsigned ind) WITNESS_RANK_ARENA_HUGE)) return (NULL); - extent_tree_szad_new(&arena->chunks_szad_cached); - extent_tree_szad_new(&arena->chunks_szad_retained); + for (i = 0; i < NPSIZES; i++) { + extent_heap_new(&arena->chunks_cached[i]); + extent_heap_new(&arena->chunks_retained[i]); + } + if (malloc_mutex_init(&arena->chunks_mtx, "arena_chunks", WITNESS_RANK_ARENA_CHUNKS)) return (NULL); @@ -3450,6 +3449,9 @@ arena_new(tsdn_t *tsdn, unsigned ind) memset(&bin->stats, 0, sizeof(malloc_bin_stats_t)); } + for (i = 0; i < NPSIZES; i++) + arena_run_heap_new(&arena->runs_avail[i]); + return (arena); } |