diff options
| author | Jason Evans <jasone@canonware.com> | 2016-06-01 18:35:30 (GMT) |
|---|---|---|
| committer | Jason Evans <jasone@canonware.com> | 2016-06-06 03:42:23 (GMT) |
| commit | c9a76481d8e411e52240a4e4313dbbfa99801073 (patch) | |
| tree | 660f60cb2b699c808b43a302df061dc8ca29745d /src/arena.c | |
| parent | 127026ad989c06feda12371e584b4af4dffaf2db (diff) | |
| download | jemalloc-c9a76481d8e411e52240a4e4313dbbfa99801073.zip jemalloc-c9a76481d8e411e52240a4e4313dbbfa99801073.tar.gz jemalloc-c9a76481d8e411e52240a4e4313dbbfa99801073.tar.bz2 | |
Rename chunks_{cached,retained,mtx} to extents_{cached,retained,mtx}.
Diffstat (limited to 'src/arena.c')
| -rw-r--r-- | src/arena.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/arena.c b/src/arena.c index 9a8c2e2..de6605a 100644 --- a/src/arena.c +++ b/src/arena.c @@ -1793,20 +1793,21 @@ arena_new(tsdn_t *tsdn, unsigned ind) return (NULL); for (i = 0; i < NPSIZES; i++) { - extent_heap_new(&arena->chunks_cached[i]); - extent_heap_new(&arena->chunks_retained[i]); + extent_heap_new(&arena->extents_cached[i]); + extent_heap_new(&arena->extents_retained[i]); } - if (malloc_mutex_init(&arena->chunks_mtx, "arena_chunks", - WITNESS_RANK_ARENA_CHUNKS)) + arena->extent_hooks = extent_hooks_default; + + if (malloc_mutex_init(&arena->extents_mtx, "arena_extents", + WITNESS_RANK_ARENA_EXTENTS)) return (NULL); + ql_new(&arena->extent_cache); if (malloc_mutex_init(&arena->extent_cache_mtx, "arena_extent_cache", WITNESS_RANK_ARENA_EXTENT_CACHE)) return (NULL); - arena->extent_hooks = extent_hooks_default; - /* Initialize bins. */ for (i = 0; i < NBINS; i++) { arena_bin_t *bin = &arena->bins[i]; @@ -1843,7 +1844,7 @@ void arena_prefork1(tsdn_t *tsdn, arena_t *arena) { - malloc_mutex_prefork(tsdn, &arena->chunks_mtx); + malloc_mutex_prefork(tsdn, &arena->extents_mtx); } void @@ -1872,7 +1873,7 @@ arena_postfork_parent(tsdn_t *tsdn, arena_t *arena) for (i = 0; i < NBINS; i++) malloc_mutex_postfork_parent(tsdn, &arena->bins[i].lock); malloc_mutex_postfork_parent(tsdn, &arena->extent_cache_mtx); - malloc_mutex_postfork_parent(tsdn, &arena->chunks_mtx); + malloc_mutex_postfork_parent(tsdn, &arena->extents_mtx); malloc_mutex_postfork_parent(tsdn, &arena->lock); } @@ -1885,6 +1886,6 @@ arena_postfork_child(tsdn_t *tsdn, arena_t *arena) for (i = 0; i < NBINS; i++) malloc_mutex_postfork_child(tsdn, &arena->bins[i].lock); malloc_mutex_postfork_child(tsdn, &arena->extent_cache_mtx); - malloc_mutex_postfork_child(tsdn, &arena->chunks_mtx); + malloc_mutex_postfork_child(tsdn, &arena->extents_mtx); malloc_mutex_postfork_child(tsdn, &arena->lock); } |