project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PA: Get rid of arena_ind_get calls.

Browse Source 
This is another step on the path towards breaking the extent reliance on the
arena module.
This commit is contained in:
David Goldblatt 2020-03-09 10:52:26 -07:00 committed by David Goldblatt
parent 1ad368c8b7
commit 1ada4aef84
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/extent.c
View File

@ -390,7 +390,7 @@ extent_recycle_extract(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
*/ */
edata_t *unlock_edata = edata; edata_t *unlock_edata = edata;
assert(edata_base_get(edata) == new_addr); assert(edata_base_get(edata) == new_addr);
if (edata_arena_ind_get(edata) != arena_ind_get(arena) if (edata_arena_ind_get(edata) != ecache_ind_get(ecache)
|| edata_size_get(edata) < size || edata_size_get(edata) < size
|| edata_state_get(edata) || edata_state_get(edata)
!= ecache->state) { != ecache->state) {
@ -661,9 +661,9 @@ extent_grow_retained(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
goto label_err; goto label_err;
} }
edata_init(edata, arena_ind_get(arena), ptr, alloc_size, false, edata_init(edata, ecache_ind_get(&arena->pa_shard.ecache_retained), ptr,
SC_NSIZES, arena_extent_sn_next(arena), extent_state_active, zeroed, alloc_size, false, SC_NSIZES, arena_extent_sn_next(arena),
committed, true, EXTENT_IS_HEAD); extent_state_active, zeroed, committed, true, EXTENT_IS_HEAD);
if (extent_register_no_gdump_add(tsdn, edata)) { if (extent_register_no_gdump_add(tsdn, edata)) {
edata_cache_put(tsdn, &arena->pa_shard.edata_cache, edata); edata_cache_put(tsdn, &arena->pa_shard.edata_cache, edata);
@ -815,9 +815,9 @@ extent_alloc_wrapper(tsdn_t *tsdn, arena_t *arena, ehooks_t *ehooks,
edata_cache_put(tsdn, &arena->pa_shard.edata_cache, edata); edata_cache_put(tsdn, &arena->pa_shard.edata_cache, edata);
return NULL; return NULL;
} }
edata_init(edata, arena_ind_get(arena), addr, size, slab, szind, edata_init(edata, ecache_ind_get(&arena->pa_shard.ecache_dirty), addr,
arena_extent_sn_next(arena), extent_state_active, *zero, *commit, size, slab, szind, arena_extent_sn_next(arena), extent_state_active,
true, EXTENT_NOT_HEAD); *zero, *commit, true, EXTENT_NOT_HEAD);
if (extent_register(tsdn, edata)) { if (extent_register(tsdn, edata)) {
edata_cache_put(tsdn, &arena->pa_shard.edata_cache, edata); edata_cache_put(tsdn, &arena->pa_shard.edata_cache, edata);
return NULL; return NULL;