kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-06 23:39:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge from dev-exp

Browse source
This commit is contained in:
daan 2020-09-14 09:05:16 -07:00
commit fba65c440c
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/region.c
View file

@ -301,9 +301,13 @@ static void* mi_region_try_alloc(size_t blocks, bool* commit, bool* large, bool*
_mi_bitmap_claim(&region->commit, 1, blocks, bit_idx, &any_uncommitted); _mi_bitmap_claim(&region->commit, 1, blocks, bit_idx, &any_uncommitted);
if (any_uncommitted) { if (any_uncommitted) {
mi_assert_internal(!info.x.is_large && !info.x.is_pinned); mi_assert_internal(!info.x.is_large && !info.x.is_pinned);
bool commit_zero; bool commit_zero = false;
_mi_mem_commit(p, blocks * MI_SEGMENT_SIZE, &commit_zero, tld); if (!_mi_mem_commit(p, blocks * MI_SEGMENT_SIZE, &commit_zero, tld)) {
if (commit_zero) *is_zero = true; // failed to commit! unclaim and return
mi_bitmap_unclaim(&region->in_use, 1, blocks, bit_idx);
return NULL;
}
if (commit_zero) *is_zero = true;
} }
} }
else { else {