From d3ec7f378ebc645b6b3bca8bb7ea92968d1284e3 Mon Sep 17 00:00:00 2001 From: Daan Leijen Date: Fri, 31 Mar 2023 10:25:32 -0700 Subject: [PATCH 1/2] fix compile on ppc64IE and s390x arches (issue #717) --- include/mimalloc/prim.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/mimalloc/prim.h b/include/mimalloc/prim.h index 68f0871e..10378c92 100644 --- a/include/mimalloc/prim.h +++ b/include/mimalloc/prim.h @@ -113,6 +113,10 @@ void _mi_prim_thread_associate_default_heap(mi_heap_t* heap); // for each thread (unequal to zero). //------------------------------------------------------------------- +// defined in `init.c`; do not use these directly +extern mi_decl_thread mi_heap_t* _mi_heap_default; // default heap to allocate from +extern bool _mi_process_is_initialized; // has mi_process_init been called? + static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept; #if defined(_WIN32) @@ -230,10 +234,6 @@ We try to circumvent this in an efficient way: - DragonFly: defaults are working but seem slow compared to freeBSD (see PR #323) ------------------------------------------------------------------------------------------- */ -// defined in `init.c`; do not use these directly -extern mi_decl_thread mi_heap_t* _mi_heap_default; // default heap to allocate from -extern bool _mi_process_is_initialized; // has mi_process_init been called? - static inline mi_heap_t* mi_prim_get_default_heap(void); #if defined(MI_MALLOC_OVERRIDE) From 3208dff17a3aa12a75afa05b8e10a7bffc3a961e Mon Sep 17 00:00:00 2001 From: Daan Leijen Date: Fri, 31 Mar 2023 10:33:36 -0700 Subject: [PATCH 2/2] remove extraneous forward declarations --- src/arena.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/src/arena.c b/src/arena.c index 152f7bea..de5e75ff 100644 --- a/src/arena.c +++ b/src/arena.c @@ -27,18 +27,6 @@ The arena allocation needs to be thread safe and we use an atomic bitmap to allo #include "bitmap.h" // atomic bitmap - -// os.c -void* _mi_os_alloc_aligned(size_t size, size_t alignment, bool commit, bool* large, mi_stats_t* stats); -void _mi_os_free_ex(void* p, size_t size, bool was_committed, mi_stats_t* stats); -void _mi_os_free(void* p, size_t size, mi_stats_t* stats); - -void* _mi_os_alloc_huge_os_pages(size_t pages, int numa_node, mi_msecs_t max_secs, size_t* pages_reserved, size_t* psize); -void _mi_os_free_huge_pages(void* p, size_t size, mi_stats_t* stats); - -bool _mi_os_commit(void* p, size_t size, bool* is_zero, mi_stats_t* stats); -bool _mi_os_decommit(void* addr, size_t size, mi_stats_t* stats); - /* ----------------------------------------------------------- Arena allocation ----------------------------------------------------------- */