mirror of
https://github.com/microsoft/mimalloc.git
synced 2025-05-13 02:39:31 +03:00
Merge branch 'dev' into dev-slice
This commit is contained in:
commit
426d2b3643
1 changed files with 1 additions and 1 deletions
|
@ -149,7 +149,7 @@ static _Atomic(size_t) mi_arena_static_top;
|
|||
static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* memid) {
|
||||
*memid = _mi_memid_none();
|
||||
if (size == 0 || size > MI_ARENA_STATIC_MAX) return NULL;
|
||||
if (mi_atomic_load_relaxed(&mi_arena_static_top) >= MI_ARENA_STATIC_MAX) return NULL;
|
||||
if ((mi_atomic_load_relaxed(&mi_arena_static_top) + size) > MI_ARENA_STATIC_MAX) return NULL;
|
||||
|
||||
// try to claim space
|
||||
if (alignment == 0) { alignment = 1; }
|
||||
|
|
Loading…
Add table
Reference in a new issue