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

further fixes to allow statically linking mimalloc in DLL modules (issue #508)

Browse source
This commit is contained in:
Daan Leijen 2022-01-10 16:07:22 -08:00
parent 5bc9a1c95f
commit 320f95f6cd
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/init.c
View file

@ -493,14 +493,14 @@ void mi_process_init(void) mi_attr_noexcept {
#endif #endif
_mi_verbose_message("secure level: %d\n", MI_SECURE); _mi_verbose_message("secure level: %d\n", MI_SECURE);
mi_thread_init(); mi_thread_init();
#if defined(_WIN32) && !defined(MI_SHARED_LIB) #if defined(_WIN32) && !defined(MI_SHARED_LIB)
/* When building as a static lib the FLS cleanup happens to early for the main thread. // When building as a static lib the FLS cleanup happens to early for the main thread.
* To avoid that set the FLS value for the main thread to NULL; the eventual // To avoid this, set the FLS value for the main thread to NULL so the fls cleanup
* mi_fls_done() execution won't call _mi_thread_done(). // will not call _mi_thread_done on the (still executing) main thread. See issue #508.
* The latter function is later called explicitly from mi_process_done().
* See GitHub issue #508 for more background and explanation. */
FlsSetValue(mi_fls_key, NULL); FlsSetValue(mi_fls_key, NULL);
#endif #endif
mi_stats_reset(); // only call stat reset *after* thread init (or the heap tld == NULL) mi_stats_reset(); // only call stat reset *after* thread init (or the heap tld == NULL)
if (mi_option_is_enabled(mi_option_reserve_huge_os_pages)) { if (mi_option_is_enabled(mi_option_reserve_huge_os_pages)) {
@ -530,9 +530,7 @@ static void mi_process_done(void) {
process_done = true; process_done = true;
#if defined(_WIN32) && !defined(MI_SHARED_LIB) #if defined(_WIN32) && !defined(MI_SHARED_LIB)
// Explicitly clean up main thread. See comment in mi_process_init() for reason FlsFree(mi_fls_key); // call thread-done on all threads (except the main thread) to prevent dangling callback pointer if statically linked with a DLL; Issue #208
_mi_thread_done(_mi_heap_default);
FlsFree(mi_fls_key); // call thread-done on all threads to prevent dangling callback pointer if statically linked with a DLL; Issue #208
#endif #endif
#if (MI_DEBUG != 0) || !defined(MI_SHARED_LIB) #if (MI_DEBUG != 0) || !defined(MI_SHARED_LIB)
@ -573,7 +571,7 @@ static void mi_process_done(void) {
mi_process_load(); mi_process_load();
return 0; return 0;
} }
typedef int(*_crt_cb)(void); typedef int(*_mi_crt_callback_t)(void);
#if defined(_M_X64) || defined(_M_ARM64) #if defined(_M_X64) || defined(_M_ARM64)
__pragma(comment(linker, "/include:" "_mi_msvc_initu")) __pragma(comment(linker, "/include:" "_mi_msvc_initu"))
#pragma section(".CRT$XIU", long, read) #pragma section(".CRT$XIU", long, read)
@ -581,7 +579,7 @@ static void mi_process_done(void) {
__pragma(comment(linker, "/include:" "__mi_msvc_initu")) __pragma(comment(linker, "/include:" "__mi_msvc_initu"))
#endif #endif
#pragma data_seg(".CRT$XIU") #pragma data_seg(".CRT$XIU")
extern "C" _crt_cb _mi_msvc_initu[] = { &_mi_process_init }; extern "C" _mi_crt_callback_t _mi_msvc_initu[] = { &_mi_process_init };
#pragma data_seg() #pragma data_seg()
#elif defined(__cplusplus) #elif defined(__cplusplus)

2
src/region.c
View file

@ -94,7 +94,7 @@ typedef struct mem_region_s {
mi_bitmap_field_t commit; // track if committed per block mi_bitmap_field_t commit; // track if committed per block
mi_bitmap_field_t reset; // track if reset per block mi_bitmap_field_t reset; // track if reset per block
_Atomic(size_t) arena_memid; // if allocated from a (huge page) arena _Atomic(size_t) arena_memid; // if allocated from a (huge page) arena
size_t padding; // round to 8 fields _Atomic(size_t) padding; // round to 8 fields (needs to be atomic for msvc, see issue #508)
} mem_region_t; } mem_region_t;
// The region map // The region map

4
test/main-override.cpp
View file

@ -46,7 +46,7 @@ int main() {
tsan_numa_test(); tsan_numa_test();
strdup_test(); strdup_test();
//test_mt_shutdown(); test_mt_shutdown();
//fail_aslr(); //fail_aslr();
mi_stats_print(NULL); mi_stats_print(NULL);
return 0; return 0;
@ -71,7 +71,7 @@ public:
static void various_tests() { static void various_tests() {
atexit(free_p); atexit(free_p);
void* p1 = malloc(78); void* p1 = malloc(78);
void* p2 = mi_malloc_aligned(16, 24); void* p2 = mi_malloc_aligned(24, 16);
free(p1); free(p1);
p1 = malloc(8); p1 = malloc(8);
char* s = mi_strdup("hello\n"); char* s = mi_strdup("hello\n");