mirror of
https://github.com/microsoft/mimalloc.git
synced 2024-12-28 05:50:51 +08:00
merge from dev-slice
This commit is contained in:
commit
627892852c
@ -737,6 +737,7 @@ size_t _mi_commit_mask_next_run(const mi_commit_mask_t* cm, size_t* idx);
|
||||
|
||||
|
||||
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
// Fast "random" shuffle
|
||||
// -------------------------------------------------------------------
|
||||
|
@ -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.
|
||||
-------------------------------------------------------------------------------- */
|
||||
|
||||
|
||||
/* -----------------------------------------------------------
|
||||
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
|
||||
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_commit_mask_create(bitidx, bitcount, cm);
|
||||
|
Loading…
x
Reference in New Issue
Block a user