mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
47 lines
2.7 KiB
Diff
47 lines
2.7 KiB
Diff
Patch-Source: https://github.com/microsoft/mimalloc/commit/a6ecb5c299e65eb7dd6602b97235126acc01a868
|
|
--
|
|
From a6ecb5c299e65eb7dd6602b97235126acc01a868 Mon Sep 17 00:00:00 2001
|
|
From: daanx <daan@effp.org>
|
|
Date: Tue, 13 May 2025 15:35:29 -0700
|
|
Subject: [PATCH] fix format specifier (for alpine linux x86, issue #1086)
|
|
|
|
diff --git a/src/arena.c b/src/arena.c
|
|
index bdae8da1..aa01ffcb 100644
|
|
--- a/src/arena.c
|
|
+++ b/src/arena.c
|
|
@@ -407,7 +407,7 @@ void* _mi_arena_alloc_aligned(size_t size, size_t alignment, size_t align_offset
|
|
|
|
// try to allocate in an arena if the alignment is small enough and the object is not too small (as for heap meta data)
|
|
if (!mi_option_is_enabled(mi_option_disallow_arena_alloc)) { // is arena allocation allowed?
|
|
- if (size >= MI_ARENA_MIN_OBJ_SIZE && alignment <= MI_SEGMENT_ALIGN && align_offset == 0)
|
|
+ if (size >= MI_ARENA_MIN_OBJ_SIZE && alignment <= MI_SEGMENT_ALIGN && align_offset == 0)
|
|
{
|
|
void* p = mi_arena_try_alloc(numa_node, size, alignment, commit, allow_large, req_arena_id, memid);
|
|
if (p != NULL) return p;
|
|
@@ -487,7 +487,7 @@ static void mi_arena_purge(mi_arena_t* arena, size_t bitmap_idx, size_t blocks)
|
|
// we need to ensure we do not try to reset (as that may be invalid for uncommitted memory).
|
|
mi_assert_internal(already_committed < blocks);
|
|
mi_assert_internal(mi_option_is_enabled(mi_option_purge_decommits));
|
|
- needs_recommit = _mi_os_purge_ex(p, size, false /* allow reset? */, mi_arena_block_size(already_committed));
|
|
+ needs_recommit = _mi_os_purge_ex(p, size, false /* allow reset? */, mi_arena_block_size(already_committed));
|
|
}
|
|
|
|
// clear the purged blocks
|
|
@@ -611,7 +611,7 @@ static bool mi_arena_try_purge(mi_arena_t* arena, mi_msecs_t now, bool force)
|
|
return any_purged;
|
|
}
|
|
|
|
-static void mi_arenas_try_purge( bool force, bool visit_all )
|
|
+static void mi_arenas_try_purge( bool force, bool visit_all )
|
|
{
|
|
if (_mi_preloading() || mi_arena_purge_delay() <= 0) return; // nothing will be scheduled
|
|
|
|
@@ -947,7 +947,7 @@ void mi_debug_show_arenas(void) mi_attr_noexcept {
|
|
for (size_t i = 0; i < max_arenas; i++) {
|
|
mi_arena_t* arena = mi_atomic_load_ptr_relaxed(mi_arena_t, &mi_arenas[i]);
|
|
if (arena == NULL) break;
|
|
- _mi_message("arena %zu: %zu blocks of size %zuMiB (in %zu fields) %s\n", i, arena->block_count, MI_ARENA_BLOCK_SIZE / MI_MiB, arena->field_count, (arena->memid.is_pinned ? ", pinned" : ""));
|
|
+ _mi_message("arena %zu: %zu blocks of size %zuMiB (in %zu fields) %s\n", i, arena->block_count, (size_t)(MI_ARENA_BLOCK_SIZE / MI_MiB), arena->field_count, (arena->memid.is_pinned ? ", pinned" : ""));
|
|
if (show_inuse) {
|
|
inuse_total += mi_debug_show_bitmap(" ", "inuse blocks", arena->block_count, arena->blocks_inuse, arena->field_count);
|
|
}
|