From 28d4ec4c5ad39bc9459cd432c34f8d9234b51431 Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Mon, 28 Oct 2019 13:14:14 -0700
Subject: [PATCH] fix statistics accounting of huge pages

---
 src/alloc.c        | 10 +++++++++-
 src/page.c         |  3 ++-
 test/test-stress.c |  7 ++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/alloc.c b/src/alloc.c
index 916b1f32..f8dab24d 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -192,7 +192,15 @@ static mi_decl_noinline void _mi_free_block_mt(mi_page_t* page, mi_block_t* bloc
       page->free = block;
       page->used--;
       page->is_zero = false;
-      _mi_segment_page_free(page,true,&heap->tld->segments);
+      mi_assert(page->used == 0);
+      mi_tld_t* tld = heap->tld;
+      if (page->block_size > MI_HUGE_OBJ_SIZE_MAX) {
+        _mi_stat_decrease(&tld->stats.giant, page->block_size);
+      }
+      else {
+        _mi_stat_decrease(&tld->stats.huge, page->block_size);
+      }
+      _mi_segment_page_free(page,true,&tld->segments);
     }
     return;
   }
diff --git a/src/page.c b/src/page.c
index 77d98f11..b71be522 100644
--- a/src/page.c
+++ b/src/page.c
@@ -370,6 +370,7 @@ void _mi_page_free(mi_page_t* page, mi_page_queue_t* pq, bool force) {
   mi_page_set_has_aligned(page, false);
 
   // account for huge pages here
+  // (note: no longer necessary as huge pages are always abandoned)
   if (page->block_size > MI_LARGE_OBJ_SIZE_MAX) {
     if (page->block_size > MI_HUGE_OBJ_SIZE_MAX) {
       _mi_stat_decrease(&page->heap->tld->stats.giant, page->block_size);
@@ -378,7 +379,7 @@ void _mi_page_free(mi_page_t* page, mi_page_queue_t* pq, bool force) {
       _mi_stat_decrease(&page->heap->tld->stats.huge, page->block_size);
     }
   }
-
+  
   // remove from the page list
   // (no need to do _mi_heap_delayed_free first as all blocks are already free)
   mi_segments_tld_t* segments_tld = &page->heap->tld->segments;
diff --git a/test/test-stress.c b/test/test-stress.c
index 354e2b07..bb428072 100644
--- a/test/test-stress.c
+++ b/test/test-stress.c
@@ -158,6 +158,7 @@ int main(int argc, char** argv) {
   //printf("(reserve huge: %i\n)", res);
 
   //bench_start_program();
+  mi_stats_reset();
   memset((void*)transfer, 0, TRANSFERS*sizeof(void*));
   run_os_threads(THREADS);
   for (int i = 0; i < TRANSFERS; i++) {
@@ -165,7 +166,6 @@ int main(int argc, char** argv) {
   }
   #ifndef NDEBUG
   mi_collect(false);
-  mi_collect(true);
   #endif
   mi_stats_print(NULL);
   //bench_end_program();
@@ -191,6 +191,11 @@ static void run_os_threads(size_t nthreads) {
   for (size_t i = 0; i < nthreads; i++) {
     WaitForSingleObject(thandles[i], INFINITE);
   }
+  for (size_t i = 0; i < nthreads; i++) {
+    CloseHandle(thandles[i]);
+  }
+  free(tids);
+  free(thandles);
 }
 
 static void* atomic_exchange_ptr(volatile void** p, void* newval) {