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

Extents -> Eset: move extents_state_get.

Browse Source
This commit is contained in:
David T. Goldblatt 2019-09-20 20:45:16 -07:00 committed by David Goldblatt
parent b416b96a39
commit 63d1b7a7a7
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/jemalloc/internal/eset.h
View File

@ -62,5 +62,6 @@ struct eset_s {
bool eset_init(tsdn_t *tsdn, eset_t *eset, extent_state_t state, bool eset_init(tsdn_t *tsdn, eset_t *eset, extent_state_t state,
bool delay_coalesce); bool delay_coalesce);
extent_state_t eset_state_get(const eset_t *eset);
#endif /* JEMALLOC_INTERNAL_ESET_H */ #endif /* JEMALLOC_INTERNAL_ESET_H */

1
include/jemalloc/internal/extent_externs.h
View File

@ -27,7 +27,6 @@ size_t extent_size_quantize_ceil(size_t size);
ph_proto(, extent_avail_, extent_tree_t, extent_t) ph_proto(, extent_avail_, extent_tree_t, extent_t)
ph_proto(, extent_heap_, extent_heap_t, extent_t) ph_proto(, extent_heap_, extent_heap_t, extent_t)
extent_state_t extents_state_get(const eset_t *eset);
size_t extents_npages_get(eset_t *eset); size_t extents_npages_get(eset_t *eset);
/* Get the number of extents in the given page size index. */ /* Get the number of extents in the given page size index. */
size_t extents_nextents_get(eset_t *eset, pszind_t ind); size_t extents_nextents_get(eset_t *eset, pszind_t ind);

2
src/arena.c
View File

@ -861,7 +861,7 @@ arena_decay_stashed(tsdn_t *tsdn, arena_t *arena,
size_t npages = extent_size_get(extent) >> LG_PAGE; size_t npages = extent_size_get(extent) >> LG_PAGE;
npurged += npages; npurged += npages;
extent_list_remove(decay_extents, extent); extent_list_remove(decay_extents, extent);
switch (extents_state_get(eset)) { switch (eset_state_get(eset)) {
case extent_state_active: case extent_state_active:
not_reached(); not_reached();
case extent_state_dirty: case extent_state_dirty:

5
src/eset.c
View File

@ -23,3 +23,8 @@ eset_init(tsdn_t *tsdn, eset_t *eset, extent_state_t state,
eset->delay_coalesce = delay_coalesce; eset->delay_coalesce = delay_coalesce;
return false; return false;
} }
extent_state_t
eset_state_get(const eset_t *eset) {
return eset->state;
}

21
src/extent.c
View File

@ -305,11 +305,6 @@ extent_size_quantize_ceil(size_t size) {
/* Generate pairing heap functions. */ /* Generate pairing heap functions. */
ph_gen(, extent_heap_, extent_heap_t, extent_t, ph_link, extent_snad_comp) ph_gen(, extent_heap_, extent_heap_t, extent_t, ph_link, extent_snad_comp)
extent_state_t
extents_state_get(const eset_t *eset) {
return eset->state;
}
size_t size_t
extents_npages_get(eset_t *eset) { extents_npages_get(eset_t *eset) {
return atomic_load_zu(&eset->npages, ATOMIC_RELAXED); return atomic_load_zu(&eset->npages, ATOMIC_RELAXED);
@ -529,7 +524,7 @@ extent_try_delayed_coalesce(tsdn_t *tsdn, arena_t *arena,
bool coalesced; bool coalesced;
extent = extent_try_coalesce(tsdn, arena, r_extent_hooks, rtree_ctx, extent = extent_try_coalesce(tsdn, arena, r_extent_hooks, rtree_ctx,
eset, extent, &coalesced, false); eset, extent, &coalesced, false);
extent_state_set(extent, extents_state_get(eset)); extent_state_set(extent, eset_state_get(eset));
if (!coalesced) { if (!coalesced) {
return true; return true;
@ -613,7 +608,7 @@ extents_evict(tsdn_t *tsdn, arena_t *arena, extent_hooks_t **r_extent_hooks,
* Either mark the extent active or deregister it to protect against * Either mark the extent active or deregister it to protect against
* concurrent operations. * concurrent operations.
*/ */
switch (extents_state_get(eset)) { switch (eset_state_get(eset)) {
case extent_state_active: case extent_state_active:
not_reached(); not_reached();
case extent_state_dirty: case extent_state_dirty:
@ -647,7 +642,7 @@ extents_abandon_vm(tsdn_t *tsdn, arena_t *arena, extent_hooks_t **r_extent_hooks
* Leak extent after making sure its pages have already been purged, so * Leak extent after making sure its pages have already been purged, so
* that this is only a virtual memory leak. * that this is only a virtual memory leak.
*/ */
if (extents_state_get(eset) == extent_state_dirty) { if (eset_state_get(eset) == extent_state_dirty) {
if (extent_purge_lazy_impl(tsdn, arena, r_extent_hooks, if (extent_purge_lazy_impl(tsdn, arena, r_extent_hooks,
extent, 0, sz, growing_retained)) { extent, 0, sz, growing_retained)) {
extent_purge_forced_impl(tsdn, arena, r_extent_hooks, extent_purge_forced_impl(tsdn, arena, r_extent_hooks,
@ -679,7 +674,7 @@ extent_deactivate_locked(tsdn_t *tsdn, arena_t *arena, eset_t *eset,
assert(extent_arena_ind_get(extent) == arena_ind_get(arena)); assert(extent_arena_ind_get(extent) == arena_ind_get(arena));
assert(extent_state_get(extent) == extent_state_active); assert(extent_state_get(extent) == extent_state_active);
extent_state_set(extent, extents_state_get(eset)); extent_state_set(extent, eset_state_get(eset));
extents_insert_locked(tsdn, eset, extent); extents_insert_locked(tsdn, eset, extent);
} }
@ -695,7 +690,7 @@ static void
extent_activate_locked(tsdn_t *tsdn, arena_t *arena, eset_t *eset, extent_activate_locked(tsdn_t *tsdn, arena_t *arena, eset_t *eset,
extent_t *extent) { extent_t *extent) {
assert(extent_arena_ind_get(extent) == arena_ind_get(arena)); assert(extent_arena_ind_get(extent) == arena_ind_get(arena));
assert(extent_state_get(extent) == extents_state_get(eset)); assert(extent_state_get(extent) == eset_state_get(eset));
extents_remove_locked(tsdn, eset, extent); extents_remove_locked(tsdn, eset, extent);
extent_state_set(extent, extent_state_active); extent_state_set(extent, extent_state_active);
@ -936,7 +931,7 @@ extent_recycle_extract(tsdn_t *tsdn, arena_t *arena,
!= arena_ind_get(arena) || != arena_ind_get(arena) ||
extent_size_get(extent) < esize || extent_size_get(extent) < esize ||
extent_state_get(extent) != extent_state_get(extent) !=
extents_state_get(eset)) { eset_state_get(eset)) {
extent = NULL; extent = NULL;
} }
extent_unlock(tsdn, unlock_extent); extent_unlock(tsdn, unlock_extent);
@ -1700,8 +1695,8 @@ extent_record(tsdn_t *tsdn, arena_t *arena, extent_hooks_t **r_extent_hooks,
rtree_ctx_t rtree_ctx_fallback; rtree_ctx_t rtree_ctx_fallback;
rtree_ctx_t *rtree_ctx = tsdn_rtree_ctx(tsdn, &rtree_ctx_fallback); rtree_ctx_t *rtree_ctx = tsdn_rtree_ctx(tsdn, &rtree_ctx_fallback);
assert((extents_state_get(eset) != extent_state_dirty && assert((eset_state_get(eset) != extent_state_dirty &&
extents_state_get(eset) != extent_state_muzzy) || eset_state_get(eset) != extent_state_muzzy) ||
!extent_zeroed_get(extent)); !extent_zeroed_get(extent));
malloc_mutex_lock(tsdn, &eset->mtx); malloc_mutex_lock(tsdn, &eset->mtx);