3party/mimalloc
0
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2024-12-27 13:33:18 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev-slice' into dev-slice-reset

Browse Source
This commit is contained in:
Daan Leijen 2023-03-31 10:44:14 -07:00
commit f8faa8f2a1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/mimalloc/prim.h
View File

@ -113,6 +113,10 @@ void _mi_prim_thread_associate_default_heap(mi_heap_t* heap);
// for each thread (unequal to zero). // 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; static inline mi_threadid_t _mi_prim_thread_id(void) mi_attr_noexcept;
#if defined(_WIN32) #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) - 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); static inline mi_heap_t* mi_prim_get_default_heap(void);
#if defined(MI_MALLOC_OVERRIDE) #if defined(MI_MALLOC_OVERRIDE)

1
src/arena.c
View File

@ -27,7 +27,6 @@ The arena allocation needs to be thread safe and we use an atomic bitmap to allo
#include "bitmap.h" // atomic bitmap #include "bitmap.h" // atomic bitmap
/* ----------------------------------------------------------- /* -----------------------------------------------------------
Arena allocation Arena allocation
----------------------------------------------------------- */ ----------------------------------------------------------- */