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

hpdata: Use addr/size instead of begin/npages.

Browse Source 
This is easier for the users of the hpdata.
This commit is contained in:
David Goldblatt 2020-11-30 14:34:27 -08:00 committed by David Goldblatt
parent 5228d869ee
commit 0971e1e4e3
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ void hpdata_init(hpdata_t *hpdata, void *addr, uint64_t age);
* Given an hpdata which can serve an allocation request, pick and reserve an
* offset within that allocation.
*/
size_t hpdata_reserve_alloc(hpdata_t *hpdata, size_t npages);
void hpdata_unreserve(hpdata_t *hpdata, size_t start, size_t npages);
void *hpdata_reserve_alloc(hpdata_t *hpdata, size_t sz);
void hpdata_unreserve(hpdata_t *hpdata, void *begin, size_t sz);
#endif /* JEMALLOC_INTERNAL_HPDATA_H */

16
src/hpdata.c
View File

@ -28,8 +28,10 @@ hpdata_init(hpdata_t *hpdata, void *addr, uint64_t age) {
fb_init(hpdata->active_pages, HUGEPAGE_PAGES);
}
size_t
hpdata_reserve_alloc(hpdata_t *hpdata, size_t npages) {
void *
hpdata_reserve_alloc(hpdata_t *hpdata, size_t sz) {
assert((sz & PAGE_MASK) == 0);
size_t npages = sz >> LG_PAGE;
assert(npages <= hpdata_longest_free_range_get(hpdata));
size_t result;
@ -91,11 +93,17 @@ hpdata_reserve_alloc(hpdata_t *hpdata, size_t npages) {
}
hpdata_longest_free_range_set(hpdata, largest_unchosen_range);
return result;
return (void *)(
(uintptr_t)hpdata_addr_get(hpdata) + (result << LG_PAGE));
}
void
hpdata_unreserve(hpdata_t *hpdata, size_t begin, size_t npages) {
hpdata_unreserve(hpdata_t *hpdata, void *addr, size_t sz) {
assert((sz & PAGE_MASK) == 0);
size_t begin = ((uintptr_t)addr - (uintptr_t)hpdata_addr_get(hpdata))
>> LG_PAGE;
assert(begin < HUGEPAGE_PAGES);
size_t npages = sz >> LG_PAGE;
size_t old_longest_range = hpdata_longest_free_range_get(hpdata);
fb_unset_range(hpdata->active_pages, HUGEPAGE_PAGES, begin, npages);

20
src/psset.c
View File

@ -152,10 +152,8 @@ psset_fit(psset_t *psset, size_t size) {
void
psset_alloc_new(psset_t *psset, hpdata_t *ps, edata_t *r_edata, size_t size) {
hpdata_assert_empty(ps);
size_t npages = size / PAGE;
size_t begin = hpdata_reserve_alloc(ps, npages);
uintptr_t addr = (uintptr_t)hpdata_addr_get(ps) + begin * PAGE;
edata_init(r_edata, edata_arena_ind_get(r_edata), (void *)addr, size,
void *addr = hpdata_reserve_alloc(ps, size);
edata_init(r_edata, edata_arena_ind_get(r_edata), addr, size,
/* slab */ false, SC_NSIZES, /* sn */ 0, extent_state_active,
/* zeroed */ false, /* committed */ true, EXTENT_PAI_HPA,
EXTENT_NOT_HEAD);
@ -171,10 +169,9 @@ psset_alloc_reuse(psset_t *psset, edata_t *r_edata, size_t size) {
}
psset_remove(psset, ps);
size_t npages = size / PAGE;
size_t begin = hpdata_reserve_alloc(ps, npages);
uintptr_t addr = (uintptr_t)hpdata_addr_get(ps) + begin * PAGE;
edata_init(r_edata, edata_arena_ind_get(r_edata), (void *)addr, size,
void *addr = hpdata_reserve_alloc(ps, size);
edata_init(r_edata, edata_arena_ind_get(r_edata), addr, size,
/* slab */ false, SC_NSIZES, /* sn */ 0, extent_state_active,
/* zeroed */ false, /* committed */ true, EXTENT_PAI_HPA,
EXTENT_NOT_HEAD);
@ -190,13 +187,8 @@ psset_dalloc(psset_t *psset, edata_t *edata) {
assert(edata_ps_get(edata) != NULL);
hpdata_t *ps = edata_ps_get(edata);
size_t begin =
((uintptr_t)edata_base_get(edata) - (uintptr_t)hpdata_addr_get(ps))
>> LG_PAGE;
size_t len = edata_size_get(edata) >> LG_PAGE;
psset_remove(psset, ps);
hpdata_unreserve(ps, begin, len);
hpdata_unreserve(ps, edata_base_get(edata), edata_size_get(edata));
if (hpdata_empty(ps)) {
return ps;
} else {