kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-04 22:49:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix alignment issue on Alpine 32-bit musl compilation (issue #895)

Browse source
This commit is contained in:
Daan 2024-05-17 09:06:27 -07:00
parent 97013ee2b4
commit 8fd1184272
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/arena.c
View file

@ -141,8 +141,8 @@ static bool mi_arena_memid_indices(mi_memid_t memid, size_t* arena_index, mi_bit
#define MI_ARENA_STATIC_MAX (MI_INTPTR_SIZE*MI_KiB) // 8 KiB on 64-bit #define MI_ARENA_STATIC_MAX (MI_INTPTR_SIZE*MI_KiB) // 8 KiB on 64-bit
static uint8_t mi_arena_static[MI_ARENA_STATIC_MAX]; static mi_decl_cache_align uint8_t mi_arena_static[MI_ARENA_STATIC_MAX]; // must be cache aligned, see issue #895
static _Atomic(size_t) mi_arena_static_top; static mi_decl_cache_align _Atomic(size_t) mi_arena_static_top;
static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* memid) { static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* memid) {
*memid = _mi_memid_none(); *memid = _mi_memid_none();
@ -151,7 +151,7 @@ static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* m
if ((toplow + size) > MI_ARENA_STATIC_MAX) return NULL; if ((toplow + size) > MI_ARENA_STATIC_MAX) return NULL;
// try to claim space // try to claim space
if (alignment == 0) { alignment = 1; } if (alignment < MI_MAX_ALIGN_SIZE) { alignment = MI_MAX_ALIGN_SIZE; }
const size_t oversize = size + alignment - 1; const size_t oversize = size + alignment - 1;
if (toplow + oversize > MI_ARENA_STATIC_MAX) return NULL; if (toplow + oversize > MI_ARENA_STATIC_MAX) return NULL;
const size_t oldtop = mi_atomic_add_acq_rel(&mi_arena_static_top, oversize); const size_t oldtop = mi_atomic_add_acq_rel(&mi_arena_static_top, oversize);
@ -167,7 +167,7 @@ static void* mi_arena_static_zalloc(size_t size, size_t alignment, mi_memid_t* m
memid->initially_zero = true; memid->initially_zero = true;
const size_t start = _mi_align_up(oldtop, alignment); const size_t start = _mi_align_up(oldtop, alignment);
uint8_t* const p = &mi_arena_static[start]; uint8_t* const p = &mi_arena_static[start];
_mi_memzero(p, size); _mi_memzero_aligned(p, size);
return p; return p;
} }
@ -175,12 +175,7 @@ static void* mi_arena_meta_zalloc(size_t size, mi_memid_t* memid, mi_stats_t* st
*memid = _mi_memid_none(); *memid = _mi_memid_none();
// try static // try static
void* p = NULL; void* p = mi_arena_static_zalloc(size, MI_MAX_ALIGN_SIZE, memid);
#if (MI_INTPTR_SIZE==4 && MI_LIBC_MUSL) // fix 32-bit musl compilation, issue #895
MI_UNUSED(mi_arena_static_zalloc);
#else
p = mi_arena_static_zalloc(size, MI_MAX_ALIGN_SIZE, memid);
#endif
if (p != NULL) return p; if (p != NULL) return p;
// or fall back to the OS // or fall back to the OS