mirrors/mimalloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge from dev-slice

Browse Source
This commit is contained in:
daan 2021-11-13 15:53:57 -08:00
commit 627892852c
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mimalloc-internal.h
View File

@ -737,6 +737,7 @@ size_t _mi_commit_mask_next_run(const mi_commit_mask_t* cm, size_t* idx);
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Fast "random" shuffle // Fast "random" shuffle
// ------------------------------------------------------------------- // -------------------------------------------------------------------

3
src/segment.c
View File

@ -152,6 +152,7 @@ size_t _mi_commit_mask_next_run(const mi_commit_mask_t* cm, size_t* idx) {
be reclaimed by still running threads, much like work-stealing. be reclaimed by still running threads, much like work-stealing.
-------------------------------------------------------------------------------- */ -------------------------------------------------------------------------------- */
/* ----------------------------------------------------------- /* -----------------------------------------------------------
Slices Slices
----------------------------------------------------------- */ ----------------------------------------------------------- */
@ -493,7 +494,7 @@ static void mi_segment_commit_mask(mi_segment_t* segment, bool conservative, uin
size_t bitcount = *full_size / MI_COMMIT_SIZE; // can be 0 size_t bitcount = *full_size / MI_COMMIT_SIZE; // can be 0
if (bitidx + bitcount > MI_COMMIT_MASK_BITS) { if (bitidx + bitcount > MI_COMMIT_MASK_BITS) {
_mi_warning_message("commit mask overflow: %zu %zu %zu %zu 0x%p %zu\n", bitidx, bitcount, start, end, p, size); _mi_warning_message("commit mask overflow: idx=%zu count=%zu start=%zx end=%zx p=0x%p size=%zu fullsize=%zu\n", bitidx, bitcount, start, end, p, size, *full_size);
} }
mi_assert_internal((bitidx + bitcount) <= MI_COMMIT_MASK_BITS); mi_assert_internal((bitidx + bitcount) <= MI_COMMIT_MASK_BITS);
mi_commit_mask_create(bitidx, bitcount, cm); mi_commit_mask_create(bitidx, bitcount, cm);