mirrors/mimalloc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev-slice

Browse Source
This commit is contained in:
Daan Leijen 2023-03-23 11:21:57 -07:00
commit b0e4309210
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/init.c
View File

@ -556,11 +556,14 @@ void mi_process_init(void) mi_attr_noexcept {
mi_detect_cpu_features(); mi_detect_cpu_features();
_mi_os_init(); _mi_os_init();
mi_heap_main_init(); mi_heap_main_init();
#if (MI_DEBUG) #if MI_DEBUG
_mi_verbose_message("debug level : %d\n", MI_DEBUG); _mi_verbose_message("debug level : %d\n", MI_DEBUG);
#endif #endif
_mi_verbose_message("secure level: %d\n", MI_SECURE); _mi_verbose_message("secure level: %d\n", MI_SECURE);
_mi_verbose_message("mem tracking: %s\n", MI_TRACK_TOOL); _mi_verbose_message("mem tracking: %s\n", MI_TRACK_TOOL);
#if MI_TSAN
_mi_verbose_message("thread santizer enabled\n");
#endif
mi_thread_init(); mi_thread_init();
#if defined(_WIN32) #if defined(_WIN32)

2
src/os.c
View File

@ -21,7 +21,7 @@ static mi_os_mem_config_t mi_os_mem_config = {
0, // large page size (usually 2MiB) 0, // large page size (usually 2MiB)
4096, // allocation granularity 4096, // allocation granularity
true, // has overcommit? (if true we use MAP_NORESERVE on mmap systems) true, // has overcommit? (if true we use MAP_NORESERVE on mmap systems)
false // must free whole? false // must free whole? (on mmap systems we can free anywhere in a mapped range, but on Windows we must free the entire span)
}; };
bool _mi_os_has_overcommit(void) { bool _mi_os_has_overcommit(void) {