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

Extract the calculation of psset heap assignment for an hpdata into a common function

Browse Source 
This is in preparation for upcoming changes I plan to make to this
logic. Extracting it into a common function will make this easier and
less error-prone, and cleans up the existing code regardless.
This commit is contained in:
Kevin Svetlitski 2023-05-27 14:21:11 -07:00 committed by Qi Wang
parent c1d3ad4674
commit 6d4aa33753
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/jemalloc/internal/hpdata.h
View File

@ -343,12 +343,12 @@ hpdata_assert_consistent(hpdata_t *hpdata) {
} }
static inline bool static inline bool
hpdata_empty(hpdata_t *hpdata) { hpdata_empty(const hpdata_t *hpdata) {
return hpdata->h_nactive == 0; return hpdata->h_nactive == 0;
} }
static inline bool static inline bool
hpdata_full(hpdata_t *hpdata) { hpdata_full(const hpdata_t *hpdata) {
return hpdata->h_nactive == HUGEPAGE_PAGES; return hpdata->h_nactive == HUGEPAGE_PAGES;
} }

47
src/psset.c
View File

@ -92,8 +92,20 @@ psset_bin_stats_remove(psset_t *psset, psset_bin_stats_t *binstats,
psset_bin_stats_insert_remove(psset, binstats, ps, false); psset_bin_stats_insert_remove(psset, binstats, ps, false);
} }
static pszind_t
psset_hpdata_heap_index(const hpdata_t *ps) {
assert(!hpdata_full(ps));
assert(!hpdata_empty(ps));
size_t longest_free_range = hpdata_longest_free_range_get(ps);
pszind_t pind = sz_psz2ind(sz_psz_quantize_floor(
longest_free_range << LG_PAGE));
assert(pind < PSSET_NPSIZES);
return pind;
}
static void static void
psset_hpdata_heap_remove(psset_t *psset, pszind_t pind, hpdata_t *ps) { psset_hpdata_heap_remove(psset_t *psset, hpdata_t *ps) {
pszind_t pind = psset_hpdata_heap_index(ps);
hpdata_age_heap_remove(&psset->pageslabs[pind], ps); hpdata_age_heap_remove(&psset->pageslabs[pind], ps);
if (hpdata_age_heap_empty(&psset->pageslabs[pind])) { if (hpdata_age_heap_empty(&psset->pageslabs[pind])) {
fb_unset(psset->pageslab_bitmap, PSSET_NPSIZES, (size_t)pind); fb_unset(psset->pageslab_bitmap, PSSET_NPSIZES, (size_t)pind);
@ -101,7 +113,8 @@ psset_hpdata_heap_remove(psset_t *psset, pszind_t pind, hpdata_t *ps) {
} }
static void static void
psset_hpdata_heap_insert(psset_t *psset, pszind_t pind, hpdata_t *ps) { psset_hpdata_heap_insert(psset_t *psset, hpdata_t *ps) {
pszind_t pind = psset_hpdata_heap_index(ps);
if (hpdata_age_heap_empty(&psset->pageslabs[pind])) { if (hpdata_age_heap_empty(&psset->pageslabs[pind])) {
fb_set(psset->pageslab_bitmap, PSSET_NPSIZES, (size_t)pind); fb_set(psset->pageslab_bitmap, PSSET_NPSIZES, (size_t)pind);
} }
@ -115,12 +128,7 @@ psset_stats_insert(psset_t* psset, hpdata_t *ps) {
} else if (hpdata_full(ps)) { } else if (hpdata_full(ps)) {
psset_bin_stats_insert(psset, psset->stats.full_slabs, ps); psset_bin_stats_insert(psset, psset->stats.full_slabs, ps);
} else { } else {
size_t longest_free_range = hpdata_longest_free_range_get(ps); pszind_t pind = psset_hpdata_heap_index(ps);
pszind_t pind = sz_psz2ind(sz_psz_quantize_floor(
longest_free_range << LG_PAGE));
assert(pind < PSSET_NPSIZES);
psset_bin_stats_insert(psset, psset->stats.nonfull_slabs[pind], psset_bin_stats_insert(psset, psset->stats.nonfull_slabs[pind],
ps); ps);
} }
@ -133,12 +141,7 @@ psset_stats_remove(psset_t *psset, hpdata_t *ps) {
} else if (hpdata_full(ps)) { } else if (hpdata_full(ps)) {
psset_bin_stats_remove(psset, psset->stats.full_slabs, ps); psset_bin_stats_remove(psset, psset->stats.full_slabs, ps);
} else { } else {
size_t longest_free_range = hpdata_longest_free_range_get(ps); pszind_t pind = psset_hpdata_heap_index(ps);
pszind_t pind = sz_psz2ind(sz_psz_quantize_floor(
longest_free_range << LG_PAGE));
assert(pind < PSSET_NPSIZES);
psset_bin_stats_remove(psset, psset->stats.nonfull_slabs[pind], psset_bin_stats_remove(psset, psset->stats.nonfull_slabs[pind],
ps); ps);
} }
@ -165,13 +168,7 @@ psset_alloc_container_insert(psset_t *psset, hpdata_t *ps) {
* going to return them from a psset_pick_alloc call. * going to return them from a psset_pick_alloc call.
*/ */
} else { } else {
size_t longest_free_range = hpdata_longest_free_range_get(ps); psset_hpdata_heap_insert(psset, ps);
pszind_t pind = sz_psz2ind(sz_psz_quantize_floor(
longest_free_range << LG_PAGE));
assert(pind < PSSET_NPSIZES);
psset_hpdata_heap_insert(psset, pind, ps);
} }
} }
@ -186,13 +183,7 @@ psset_alloc_container_remove(psset_t *psset, hpdata_t *ps) {
} else if (hpdata_full(ps)) { } else if (hpdata_full(ps)) {
/* Same as above -- do nothing in this case. */ /* Same as above -- do nothing in this case. */
} else { } else {
size_t longest_free_range = hpdata_longest_free_range_get(ps); psset_hpdata_heap_remove(psset, ps);
pszind_t pind = sz_psz2ind(sz_psz_quantize_floor(
longest_free_range << LG_PAGE));
assert(pind < PSSET_NPSIZES);
psset_hpdata_heap_remove(psset, pind, ps);
} }
} }