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

fix assertion that was too strict (issue #691)

Browse Source
This commit is contained in:
Daan Leijen 2023-01-31 16:02:35 -08:00
parent 7bb34e056c
commit 1e4b6b734e
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/segment.c
View File

@ -632,7 +632,8 @@ static mi_slice_t* mi_segment_span_free_coalesce(mi_slice_t* slice, mi_segments_
// for huge pages, just mark as free but don't add to the queues // for huge pages, just mark as free but don't add to the queues
if (segment->kind == MI_SEGMENT_HUGE) { if (segment->kind == MI_SEGMENT_HUGE) {
mi_assert_internal(segment->used == 1); // decreased right after this call in `mi_segment_page_clear` // issue #691: segment->used can be 0 if the huge page block was freed while abandoned (reclaim will get here in that case)
mi_assert_internal((segment->used==0 && slice->xblock_size==0) || segment->used == 1); // decreased right after this call in `mi_segment_page_clear`
slice->xblock_size = 0; // mark as free anyways slice->xblock_size = 0; // mark as free anyways
// we should mark the last slice `xblock_size=0` now to maintain invariants but we skip it to // we should mark the last slice `xblock_size=0` now to maintain invariants but we skip it to
// avoid a possible cache miss (and the segment is about to be freed) // avoid a possible cache miss (and the segment is about to be freed)

43
test/main-override.cpp
View File

@ -37,6 +37,7 @@ static void fail_aslr(); // issue #372
static void tsan_numa_test(); // issue #414 static void tsan_numa_test(); // issue #414
static void strdup_test(); // issue #445 static void strdup_test(); // issue #445
static void bench_alloc_large(void); // issue #xxx static void bench_alloc_large(void); // issue #xxx
static void test_large_migrate(void); // issue #691
static void heap_thread_free_huge(); static void heap_thread_free_huge();
static void test_stl_allocators(); static void test_stl_allocators();
@ -44,8 +45,8 @@ static void test_stl_allocators();
int main() { int main() {
mi_stats_reset(); // ignore earlier allocations mi_stats_reset(); // ignore earlier allocations
heap_thread_free_huge();
/* /*
heap_thread_free_huge();
heap_thread_free_large(); heap_thread_free_large();
heap_no_delete(); heap_no_delete();
heap_late_free(); heap_late_free();
@ -55,8 +56,9 @@ int main() {
tsan_numa_test(); tsan_numa_test();
strdup_test(); strdup_test();
*/ */
test_stl_allocators(); // test_stl_allocators();
test_mt_shutdown(); // test_mt_shutdown();
test_large_migrate();
//fail_aslr(); //fail_aslr();
bench_alloc_large(); bench_alloc_large();
@ -171,6 +173,41 @@ static void test_stl_allocators() {
test_stl_allocator6(); test_stl_allocator6();
} }
// issue #691
static char* cptr;
static void* thread1_allocate()
{
cptr = mi_calloc_tp(char,22085632);
return NULL;
}
static void* thread2_free()
{
assert(cptr);
mi_free(cptr);
cptr = NULL;
return NULL;
}
static void test_large_migrate(void) {
auto t1 = std::thread(thread1_allocate);
t1.join();
auto t2 = std::thread(thread2_free);
t2.join();
/*
pthread_t thread1, thread2;
pthread_create(&thread1, NULL, &thread1_allocate, NULL);
pthread_join(thread1, NULL);
pthread_create(&thread2, NULL, &thread2_free, NULL);
pthread_join(thread2, NULL);
*/
return;
}
// issue 445 // issue 445
static void strdup_test() { static void strdup_test() {
#ifdef _MSC_VER #ifdef _MSC_VER