From 2b108c8748410b81ca239c4f6a3639845d135587 Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Fri, 3 Jan 2020 21:39:18 -0800
Subject: [PATCH] increase retire expiration to 4

---
 include/mimalloc-internal.h |  1 +
 src/heap.c                  |  5 +++--
 src/page.c                  | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h
index d41dfadc..cfbd9782 100644
--- a/include/mimalloc-internal.h
+++ b/include/mimalloc-internal.h
@@ -90,6 +90,7 @@ void       _mi_page_unfull(mi_page_t* page);
 void       _mi_page_free(mi_page_t* page, mi_page_queue_t* pq, bool force);   // free the page
 void       _mi_page_abandon(mi_page_t* page, mi_page_queue_t* pq);            // abandon the page, to be picked up by another thread...
 void       _mi_heap_delayed_free(mi_heap_t* heap);
+void       _mi_heap_collect_retired(mi_heap_t* heap, bool force);
 
 void       _mi_page_use_delayed_free(mi_page_t* page, mi_delayed_t delay);
 size_t     _mi_page_queue_append(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_queue_t* append);
diff --git a/src/heap.c b/src/heap.c
index f90c4624..963cb982 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -46,7 +46,7 @@ static bool mi_heap_visit_pages(mi_heap_t* heap, heap_page_visitor_fun* fn, void
 
 
 #if MI_DEBUG>=3
-static bool _mi_heap_page_is_valid(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t* page, void* arg1, void* arg2) {
+static bool mi_heap_page_is_valid(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t* page, void* arg1, void* arg2) {
   UNUSED(arg1);
   UNUSED(arg2);
   UNUSED(pq);
@@ -59,7 +59,7 @@ static bool _mi_heap_page_is_valid(mi_heap_t* heap, mi_page_queue_t* pq, mi_page
 
 static bool mi_heap_is_valid(mi_heap_t* heap) {
   mi_assert_internal(heap!=NULL);
-  mi_heap_visit_pages(heap, &_mi_heap_page_is_valid, NULL, NULL);
+  mi_heap_visit_pages(heap, &mi_heap_page_is_valid, NULL, NULL);
   return true;
 }
 #endif
@@ -84,6 +84,7 @@ typedef enum mi_collect_e {
 static bool mi_heap_page_collect(mi_heap_t* heap, mi_page_queue_t* pq, mi_page_t* page, void* arg_collect, void* arg2 ) {
   UNUSED(arg2);
   UNUSED(heap);
+  mi_assert_internal(mi_heap_page_is_valid(heap, pq, page, NULL, NULL));
   mi_collect_t collect = *((mi_collect_t*)arg_collect);
   _mi_page_free_collect(page, collect >= ABANDON);
   if (mi_page_all_free(page)) {
diff --git a/src/page.c b/src/page.c
index f5f51a72..b0b500ca 100644
--- a/src/page.c
+++ b/src/page.c
@@ -426,7 +426,7 @@ void _mi_page_retire(mi_page_t* page) {
   if (mi_likely(page->block_size <= MI_SMALL_SIZE_MAX)) {
     if (pq->last==page && pq->first==page) { // the only page in the queue?
       mi_stat_counter_increase(_mi_stats_main.page_no_retire,1);
-      page->retire_expire = 2;
+      page->retire_expire = 4;
       mi_assert_internal(mi_page_all_free(page));
       return; // dont't free after all
     }
@@ -437,14 +437,14 @@ void _mi_page_retire(mi_page_t* page) {
 
 // free retired pages: we don't need to look at the entire queues
 // since we only retire pages that are the last one in a queue.
-static void mi_page_retired_collect(mi_heap_t* heap) {
+void _mi_heap_collect_retired(mi_heap_t* heap, bool force) {
   for(mi_page_queue_t* pq = heap->pages; pq->block_size <= MI_SMALL_SIZE_MAX; pq++) {
     mi_page_t* page = pq->first;
     if (page != NULL && page->retire_expire != 0) {
       if (mi_page_all_free(page)) {
         page->retire_expire--;
-        if (page->retire_expire == 0) {
-          _mi_page_free(pq->first, pq, false);
+        if (force || page->retire_expire == 0) {
+          _mi_page_free(pq->first, pq, force);
         }
       }
       else {
@@ -725,7 +725,7 @@ static mi_page_t* mi_page_queue_find_free_ex(mi_heap_t* heap, mi_page_queue_t* p
   mi_assert_internal(page == NULL || mi_page_immediate_available(page));
 
   // finally collect retired pages
-  mi_page_retired_collect(heap);
+  _mi_heap_collect_retired(heap,false);
   return page;
 }