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

hpdata: Strengthen assertions.

Browse Source 
Now that we have flat bitmap bit counting functions, we can easily assert that
nfree is always correct.  While we're tightening up this code, enforce
consistency on API boundaries as well.
This commit is contained in:
David Goldblatt 2020-12-02 14:21:36 -08:00 committed by David Goldblatt
parent f51948d9e1
commit a559caf74a
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,8 +114,15 @@ hpdata_assert_empty(hpdata_t *hpdata) {
static inline bool static inline bool
hpdata_consistent(hpdata_t *hpdata) { hpdata_consistent(hpdata_t *hpdata) {
return fb_urange_longest(hpdata->active_pages, HUGEPAGE_PAGES) if(fb_urange_longest(hpdata->active_pages, HUGEPAGE_PAGES)
== hpdata_longest_free_range_get(hpdata); != hpdata_longest_free_range_get(hpdata)) {
return false;
}
if (fb_ucount(hpdata->active_pages, HUGEPAGE_PAGES, 0, HUGEPAGE_PAGES)
!= hpdata_nfree_get(hpdata)) {
return false;
}
return true;
} }
static inline void static inline void

9
src/hpdata.c
View File

@ -17,7 +17,6 @@ hpdata_age_comp(const hpdata_t *a, const hpdata_t *b) {
ph_gen(, hpdata_age_heap_, hpdata_age_heap_t, hpdata_t, ph_link, hpdata_age_comp) ph_gen(, hpdata_age_heap_, hpdata_age_heap_t, hpdata_t, ph_link, hpdata_age_comp)
void void
hpdata_init(hpdata_t *hpdata, void *addr, uint64_t age) { hpdata_init(hpdata_t *hpdata, void *addr, uint64_t age) {
hpdata_addr_set(hpdata, addr); hpdata_addr_set(hpdata, addr);
@ -26,10 +25,13 @@ hpdata_init(hpdata_t *hpdata, void *addr, uint64_t age) {
hpdata_nfree_set(hpdata, HUGEPAGE_PAGES); hpdata_nfree_set(hpdata, HUGEPAGE_PAGES);
hpdata_longest_free_range_set(hpdata, HUGEPAGE_PAGES); hpdata_longest_free_range_set(hpdata, HUGEPAGE_PAGES);
fb_init(hpdata->active_pages, HUGEPAGE_PAGES); fb_init(hpdata->active_pages, HUGEPAGE_PAGES);
hpdata_assert_consistent(hpdata);
} }
void * void *
hpdata_reserve_alloc(hpdata_t *hpdata, size_t sz) { hpdata_reserve_alloc(hpdata_t *hpdata, size_t sz) {
hpdata_assert_consistent(hpdata);
assert((sz & PAGE_MASK) == 0); assert((sz & PAGE_MASK) == 0);
size_t npages = sz >> LG_PAGE; size_t npages = sz >> LG_PAGE;
assert(npages <= hpdata_longest_free_range_get(hpdata)); assert(npages <= hpdata_longest_free_range_get(hpdata));
@ -93,12 +95,15 @@ hpdata_reserve_alloc(hpdata_t *hpdata, size_t sz) {
} }
hpdata_longest_free_range_set(hpdata, largest_unchosen_range); hpdata_longest_free_range_set(hpdata, largest_unchosen_range);
hpdata_assert_consistent(hpdata);
return (void *)( return (void *)(
(uintptr_t)hpdata_addr_get(hpdata) + (result << LG_PAGE)); (uintptr_t)hpdata_addr_get(hpdata) + (result << LG_PAGE));
} }
void void
hpdata_unreserve(hpdata_t *hpdata, void *addr, size_t sz) { hpdata_unreserve(hpdata_t *hpdata, void *addr, size_t sz) {
hpdata_assert_consistent(hpdata);
assert(((uintptr_t)addr & PAGE_MASK) == 0);
assert((sz & PAGE_MASK) == 0); assert((sz & PAGE_MASK) == 0);
size_t begin = ((uintptr_t)addr - (uintptr_t)hpdata_addr_get(hpdata)) size_t begin = ((uintptr_t)addr - (uintptr_t)hpdata_addr_get(hpdata))
>> LG_PAGE; >> LG_PAGE;
@ -119,4 +124,6 @@ hpdata_unreserve(hpdata_t *hpdata, void *addr, size_t sz) {
} }
hpdata_nfree_set(hpdata, hpdata_nfree_get(hpdata) + npages); hpdata_nfree_set(hpdata, hpdata_nfree_get(hpdata) + npages);
hpdata_assert_consistent(hpdata);
} }