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

merge from dev

Browse source
This commit is contained in:
daan 2019-08-30 14:38:28 -07:00
commit ab5af8fdad
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/options.c
View file

@ -80,7 +80,12 @@ static void mi_option_init(mi_option_desc_t* desc);
void _mi_options_init(void) { void _mi_options_init(void) {
// called on process load // called on process load
for(int i = 0; i < _mi_option_last; i++ ) { for(int i = 0; i < _mi_option_last; i++ ) {
mi_option_get((mi_option_t)i); // initialize mi_option_t option = (mi_option_t)i;
mi_option_get(option); // initialize
if (option != mi_option_verbose) {
mi_option_desc_t* desc = &options[option];
_mi_verbose_message("option '%s': %ld\n", desc->name, desc->value);
}
} }
} }
@ -89,10 +94,7 @@ long mi_option_get(mi_option_t option) {
mi_option_desc_t* desc = &options[option]; mi_option_desc_t* desc = &options[option];
mi_assert(desc->option == option); // index should match the option mi_assert(desc->option == option); // index should match the option
if (mi_unlikely(desc->init == UNINIT)) { if (mi_unlikely(desc->init == UNINIT)) {
mi_option_init(desc); mi_option_init(desc);
if (option != mi_option_verbose) {
_mi_verbose_message("option '%s': %ld\n", desc->name, desc->value);
}
} }
return desc->value; return desc->value;
} }
@ -173,7 +175,7 @@ static mi_decl_thread bool recurse = false;
void _mi_fputs(mi_output_fun* out, const char* prefix, const char* message) { void _mi_fputs(mi_output_fun* out, const char* prefix, const char* message) {
if (_mi_preloading() || recurse) return; if (_mi_preloading() || recurse) return;
if (out==NULL) out = mi_out_get_default(); if (out==NULL || (FILE*)out==stdout || (FILE*)out==stderr) out = mi_out_get_default();
recurse = true; recurse = true;
if (prefix != NULL) out(prefix); if (prefix != NULL) out(prefix);
out(message); out(message);