kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-07-01 09:14:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge error where commit bits in the pagemap were not set

Browse source
This commit is contained in:
Daan 2025-06-17 19:34:32 -07:00
parent 2ce6568af6
commit 99976d6c2b
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mimalloc/internal.h
View file

@ -613,7 +613,7 @@ static inline size_t _mi_page_map_index(const void* p, size_t* sub_idx) {
return (u / MI_PAGE_MAP_SUB_COUNT); return (u / MI_PAGE_MAP_SUB_COUNT);
} }
static inline mi_page_t** _mi_page_map_at(size_t idx) { static inline mi_submap_t _mi_page_map_at(size_t idx) {
return mi_atomic_load_ptr_relaxed(mi_page_t*, &_mi_page_map[idx]); return mi_atomic_load_ptr_relaxed(mi_page_t*, &_mi_page_map[idx]);
} }

5
src/page-map.c
View file

@ -224,8 +224,9 @@ static bool mi_page_map_ensure_committed(size_t idx, mi_submap_t* submap) {
mi_page_map_cannot_commit(); mi_page_map_cannot_commit();
return false; return false;
} }
mi_atomic_or_acq_rel(&mi_page_map_commit, MI_ZU(1) << bit_idx);
} }
*submap = _mi_page_map[idx]; *submap = mi_atomic_load_ptr_acquire(mi_page_t*, &_mi_page_map[idx]); // acquire _mi_page_map_at(idx);
return true; return true;
} }
@ -295,7 +296,7 @@ void _mi_page_map_unsafe_destroy(mi_subproc_t* subproc) {
for (size_t idx = 1; idx < mi_page_map_count; idx++) { // skip entry 0 (as we allocate that submap at the end of the page_map) for (size_t idx = 1; idx < mi_page_map_count; idx++) { // skip entry 0 (as we allocate that submap at the end of the page_map)
// free all sub-maps // free all sub-maps
if (mi_page_map_is_committed(idx, NULL)) { if (mi_page_map_is_committed(idx, NULL)) {
mi_page_t** sub = _mi_page_map_at(idx); mi_submap_t sub = _mi_page_map_at(idx);
if (sub != NULL) { if (sub != NULL) {
mi_memid_t memid = _mi_memid_create_os(sub, MI_PAGE_MAP_SUB_SIZE, true, false, false); mi_memid_t memid = _mi_memid_create_os(sub, MI_PAGE_MAP_SUB_SIZE, true, false, false);
_mi_os_free_ex(memid.mem.os.base, memid.mem.os.size, true, memid, subproc); _mi_os_free_ex(memid.mem.os.base, memid.mem.os.size, true, memid, subproc);