mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-07 15:59:32 +03:00
Merge branch 'dev' into dev-slice
This commit is contained in:
commit
6303cd46cf
1 changed files with 1 additions and 3 deletions
|
@ -305,9 +305,7 @@ static mi_decl_noinline void* mi_arena_try_alloc(int numa_node, size_t size, siz
|
||||||
MI_UNUSED(alignment);
|
MI_UNUSED(alignment);
|
||||||
mi_assert_internal(alignment <= MI_SEGMENT_ALIGN);
|
mi_assert_internal(alignment <= MI_SEGMENT_ALIGN);
|
||||||
const size_t max_arena = mi_atomic_load_relaxed(&mi_arena_count);
|
const size_t max_arena = mi_atomic_load_relaxed(&mi_arena_count);
|
||||||
const size_t bcount = mi_block_count_of_size(size);
|
|
||||||
if mi_likely(max_arena == 0) return NULL;
|
if mi_likely(max_arena == 0) return NULL;
|
||||||
mi_assert_internal(size <= mi_arena_block_size(bcount));
|
|
||||||
|
|
||||||
if (req_arena_id != _mi_arena_id_none()) {
|
if (req_arena_id != _mi_arena_id_none()) {
|
||||||
// try a specific arena if requested
|
// try a specific arena if requested
|
||||||
|
|
Loading…
Add table
Reference in a new issue