From bcce4d52bf1494746f4dd7f5569e542cbfdf5d36 Mon Sep 17 00:00:00 2001 From: Daan Leijen Date: Mon, 18 Oct 2021 20:39:39 -0700 Subject: [PATCH] fix bug in determination of block size in pre-reserved arena memory --- src/arena.c | 2 +- src/init.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/arena.c b/src/arena.c index 0e6615a4..a4e473a3 100644 --- a/src/arena.c +++ b/src/arena.c @@ -287,7 +287,7 @@ bool mi_manage_os_memory(void* start, size_t size, bool is_committed, bool is_la is_committed = true; } - const size_t bcount = mi_block_count_of_size(size); + const size_t bcount = size / MI_ARENA_BLOCK_SIZE; const size_t fields = _mi_divide_up(bcount, MI_BITMAP_FIELD_BITS); const size_t bitmaps = (is_committed ? 2 : 3); const size_t asize = sizeof(mi_arena_t) + (bitmaps*fields*sizeof(mi_bitmap_field_t)); diff --git a/src/init.c b/src/init.c index c0f09b5e..d899f6ad 100644 --- a/src/init.c +++ b/src/init.c @@ -498,7 +498,9 @@ void mi_process_init(void) mi_attr_noexcept { } if (mi_option_is_enabled(mi_option_reserve_os_memory)) { long ksize = mi_option_get(mi_option_reserve_os_memory); - if (ksize > 0) mi_reserve_os_memory((size_t)ksize*KiB, true, true); + if (ksize > 0) { + mi_reserve_os_memory(_mi_divide_up((size_t)ksize*KiB, MI_SEGMENT_SIZE), true, true); + } } }