update tests with static

This commit is contained in:
Daan Leijen 2021-07-26 19:14:29 -07:00
parent bf19c6b3d6
commit 32c5e4774f

View file

@ -26,15 +26,15 @@ static void msleep(unsigned long msecs) { Sleep(msecs); }
static void msleep(unsigned long msecs) { usleep(msecs * 1000UL); } static void msleep(unsigned long msecs) { usleep(msecs * 1000UL); }
#endif #endif
void heap_thread_free_large(); // issue #221 static void heap_thread_free_large(); // issue #221
void heap_no_delete(); // issue #202 static void heap_no_delete(); // issue #202
void heap_late_free(); // issue #204 static void heap_late_free(); // issue #204
void padding_shrink(); // issue #209 static void padding_shrink(); // issue #209
void various_tests(); static void various_tests();
void test_mt_shutdown(); static void test_mt_shutdown();
void fail_aslr(); // issue #372 static void fail_aslr(); // issue #372
void tsan_numa_test(); // issue #414 static void tsan_numa_test(); // issue #414
void strdup_test(); // issue #445 static void strdup_test(); // issue #445
int main() { int main() {
mi_stats_reset(); // ignore earlier allocations mi_stats_reset(); // ignore earlier allocations
@ -68,7 +68,7 @@ public:
}; };
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(16, 24);
@ -106,7 +106,7 @@ public:
static Static s = Static(); static Static s = Static();
bool test_stl_allocator1() { static bool test_stl_allocator1() {
std::vector<int, mi_stl_allocator<int> > vec; std::vector<int, mi_stl_allocator<int> > vec;
vec.push_back(1); vec.push_back(1);
vec.pop_back(); vec.pop_back();
@ -115,7 +115,7 @@ bool test_stl_allocator1() {
struct some_struct { int i; int j; double z; }; struct some_struct { int i; int j; double z; };
bool test_stl_allocator2() { static bool test_stl_allocator2() {
std::vector<some_struct, mi_stl_allocator<some_struct> > vec; std::vector<some_struct, mi_stl_allocator<some_struct> > vec;
vec.push_back(some_struct()); vec.push_back(some_struct());
vec.pop_back(); vec.pop_back();
@ -135,28 +135,28 @@ static void strdup_test() {
} }
// Issue #202 // Issue #202
void heap_no_delete_worker() { static void heap_no_delete_worker() {
mi_heap_t* heap = mi_heap_new(); mi_heap_t* heap = mi_heap_new();
void* q = mi_heap_malloc(heap, 1024); void* q = mi_heap_malloc(heap, 1024);
// mi_heap_delete(heap); // uncomment to prevent assertion // mi_heap_delete(heap); // uncomment to prevent assertion
} }
void heap_no_delete() { static void heap_no_delete() {
auto t1 = std::thread(heap_no_delete_worker); auto t1 = std::thread(heap_no_delete_worker);
t1.join(); t1.join();
} }
// Issue #204 // Issue #204
volatile void* global_p; static volatile void* global_p;
void t1main() { static void t1main() {
mi_heap_t* heap = mi_heap_new(); mi_heap_t* heap = mi_heap_new();
global_p = mi_heap_malloc(heap, 1024); global_p = mi_heap_malloc(heap, 1024);
mi_heap_delete(heap); mi_heap_delete(heap);
} }
void heap_late_free() { static void heap_late_free() {
auto t1 = std::thread(t1main); auto t1 = std::thread(t1main);
msleep(2000); msleep(2000);
@ -173,7 +173,7 @@ static void alloc0(/* void* arg */)
shared_p = mi_malloc(8); shared_p = mi_malloc(8);
} }
void padding_shrink(void) static void padding_shrink(void)
{ {
auto t1 = std::thread(alloc0); auto t1 = std::thread(alloc0);
t1.join(); t1.join();
@ -182,11 +182,11 @@ void padding_shrink(void)
// Issue #221 // Issue #221
void heap_thread_free_large_worker() { static void heap_thread_free_large_worker() {
mi_free(shared_p); mi_free(shared_p);
} }
void heap_thread_free_large() { static void heap_thread_free_large() {
for (int i = 0; i < 100; i++) { for (int i = 0; i < 100; i++) {
shared_p = mi_malloc_aligned(2*1024*1024 + 1, 8); shared_p = mi_malloc_aligned(2*1024*1024 + 1, 8);
auto t1 = std::thread(heap_thread_free_large_worker); auto t1 = std::thread(heap_thread_free_large_worker);
@ -196,7 +196,7 @@ void heap_thread_free_large() {
void test_mt_shutdown() static void test_mt_shutdown()
{ {
const int threads = 5; const int threads = 5;
std::vector< std::future< std::vector< char* > > > ts; std::vector< std::future< std::vector< char* > > > ts;
@ -221,7 +221,7 @@ void test_mt_shutdown()
} }
// issue #372 // issue #372
void fail_aslr() { static void fail_aslr() {
size_t sz = (4ULL << 40); // 4TiB size_t sz = (4ULL << 40); // 4TiB
void* p = malloc(sz); void* p = malloc(sz);
printf("pointer p: %p: area up to %p\n", p, (uint8_t*)p + sz); printf("pointer p: %p: area up to %p\n", p, (uint8_t*)p + sz);
@ -229,12 +229,12 @@ void fail_aslr() {
} }
// issues #414 // issues #414
void dummy_worker() { static void dummy_worker() {
void* p = mi_malloc(0); void* p = mi_malloc(0);
mi_free(p); mi_free(p);
} }
void tsan_numa_test() { static void tsan_numa_test() {
auto t1 = std::thread(dummy_worker); auto t1 = std::thread(dummy_worker);
dummy_worker(); dummy_worker();
t1.join(); t1.join();