lihao/jemalloc
1
0
Fork 0
mirror of https://github.com/jemalloc/jemalloc.git synced 2026-07-24 13:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that the root of a heap is always the best element.

Browse Source
This commit is contained in:
Amaury Séchet
2023-10-25 01:01:22 +00:00
committed by Qi Wang
parent 1978e5cdac
commit 10d713151d
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/jemalloc/internal/ph.h
View File

@@ -239,7 +239,7 @@ ph_merge_aux(ph_t *ph, size_t offset, ph_cmp_t cmp) {
phn_prev_set(phn, NULL, offset); phn_prev_set(phn, NULL, offset);
phn = phn_merge_siblings(phn, offset, cmp); phn = phn_merge_siblings(phn, offset, cmp);
assert(phn_next_get(phn, offset) == NULL); assert(phn_next_get(phn, offset) == NULL);
ph->root = phn_merge(ph->root, phn, offset, cmp); phn_merge_ordered(ph->root, phn, offset, cmp);
} }
} }
@@ -380,20 +380,9 @@ ph_remove_first(ph_t *ph, size_t offset, ph_cmp_t cmp) {
JEMALLOC_ALWAYS_INLINE void JEMALLOC_ALWAYS_INLINE void
ph_remove(ph_t *ph, void *phn, size_t offset, ph_cmp_t cmp) { ph_remove(ph_t *ph, void *phn, size_t offset, ph_cmp_t cmp) {
if (ph->root == phn) { if (ph->root == phn) {
/*
* We can delete from aux list without merging it, but we need
* to merge if we are dealing with the root node and it has
* children.
*/
if (phn_lchild_get(phn, offset) == NULL) {
ph->root = phn_next_get(phn, offset);
return;
}
ph_merge_aux(ph, offset, cmp); ph_merge_aux(ph, offset, cmp);
if (ph->root == phn) { ph->root = ph_merge_children(phn, offset, cmp);
ph->root = ph_merge_children(ph->root, offset, cmp); return;
return;
}
} }
void* prev = phn_prev_get(phn, offset); void* prev = phn_prev_get(phn, offset);