merge from dev

This commit is contained in:
Daan 2023-03-04 14:52:30 -08:00
commit e4b9ea918f
11 changed files with 118 additions and 75 deletions

View file

@ -51,7 +51,7 @@ bool test_stl_allocator2(void);
// ---------------------------------------------------------------------------
int main(void) {
mi_option_disable(mi_option_verbose);
// ---------------------------------------------------
// Malloc
// ---------------------------------------------------
@ -149,7 +149,8 @@ int main(void) {
for (size_t align = 1; align <= MI_ALIGNMENT_MAX && ok; align *= 2) {
void* ps[8];
for (int i = 0; i < 8 && ok; i++) {
ps[i] = mi_malloc_aligned(align*5 /*size*/, align);
ps[i] = mi_malloc_aligned(align*13 // size
, align);
if (ps[i] == NULL || (uintptr_t)(ps[i]) % align != 0) {
ok = false;
}

View file

@ -244,6 +244,9 @@ int main(int argc, char** argv) {
//printf("(reserve huge: %i\n)", res);
//bench_start_program();
#ifndef USE_STD_MALLOC
mi_stats_reset();
#endif
// Run ITER full iterations where half the objects in the transfer buffer survive to the next round.
srand(0x7feb352d);