merge from dev

This commit is contained in:
Daan Leijen 2025-03-01 16:58:57 -08:00
commit 7758bb1067
4 changed files with 66 additions and 79 deletions

View file

@ -285,9 +285,6 @@ int main(int argc, char** argv) {
#if !defined(NDEBUG) && !defined(USE_STD_MALLOC)
mi_option_set(mi_option_arena_reserve, 32 * 1024 /* in kib = 32MiB */);
#endif
#ifndef USE_STD_MALLOC
mi_stats_reset();
#endif
// > mimalloc-test-stress [THREADS] [SCALE] [ITER]
if (argc >= 2) {
@ -320,9 +317,9 @@ int main(int argc, char** argv) {
//mi_reserve_os_memory(512ULL << 20, true, true);
#if !defined(NDEBUG) && !defined(USE_STD_MALLOC)
#if !defined(NDEBUG) && !defined(USE_STD_MALLOC)
mi_stats_reset();
#endif
#endif
#ifdef STRESS
test_stress();