From e32048879183c2672db7d06138ca6f4eb80ebfa1 Mon Sep 17 00:00:00 2001
From: daan <daanl@outlook.com>
Date: Sun, 3 Nov 2019 12:18:32 -0800
Subject: [PATCH] add numa nodes to stats

---
 include/mimalloc-internal.h | 2 +-
 src/os.c                    | 7 +++++--
 src/stats.c                 | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/include/mimalloc-internal.h b/include/mimalloc-internal.h
index b4d3351d..c28cf0fd 100644
--- a/include/mimalloc-internal.h
+++ b/include/mimalloc-internal.h
@@ -57,7 +57,7 @@ void*      _mi_os_alloc(size_t size, mi_stats_t* stats);           // to allocat
 void       _mi_os_free(void* p, size_t size, mi_stats_t* stats);   // to free thread local data
 size_t     _mi_os_good_alloc_size(size_t size);
 int        _mi_os_numa_node(mi_os_tld_t* tld);
-
+int        _mi_os_numa_node_count(void);
 
 // memory.c
 void*      _mi_mem_alloc_aligned(size_t size, size_t alignment, bool* commit, bool* large, bool* is_zero, size_t* id, mi_os_tld_t* tld);
diff --git a/src/os.c b/src/os.c
index e1dc31f8..af3c440c 100644
--- a/src/os.c
+++ b/src/os.c
@@ -840,7 +840,8 @@ static void* mi_os_alloc_huge_os_pagesx(void* addr, size_t size, int numa_node)
   }
 
   if (p == NULL) {
-    _mi_warning_message("failed to allocate huge OS pages (size %zu) (error %d)\n", size, GetLastError());
+    DWORD winerr = GetLastError();
+    _mi_warning_message("failed to allocate huge OS pages (size %zu) (windows error %d%s)\n", size, winerr, (winerr==1450 ? " (insufficient resources)" : ""));
   }
   return p;
 }
@@ -981,12 +982,14 @@ static int mi_os_numa_node_countx(void) {
 int _mi_os_numa_node_count(void) {
   static int numa_node_count = 0;   // cache the node count 
   if (mi_unlikely(numa_node_count <= 0)) {
-    int ncount = mi_os_numa_node_countx();
+    int ncount = mi_os_numa_node_countx();    
+    int ncount0 = ncount;
     // never more than max numa node and at least 1
     int nmax = 1 + (int)mi_option_get(mi_option_max_numa_node);
     if (ncount > nmax) ncount = nmax;
     if (ncount <= 0)   ncount = 1;
     numa_node_count = ncount;
+    _mi_verbose_message("using %i numa regions (%i nodes detected)\n", numa_node_count, ncount0);
   }
   mi_assert_internal(numa_node_count >= 1);
   return numa_node_count;
diff --git a/src/stats.c b/src/stats.c
index 50bd029d..79362cc4 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -265,7 +265,7 @@ static void _mi_stats_print(mi_stats_t* stats, double secs, mi_output_fun* out)
   mi_stat_counter_print(&stats->commit_calls, "commits", out);
   mi_stat_print(&stats->threads, "threads", -1, out);
   mi_stat_counter_print_avg(&stats->searches, "searches", out);
-
+  _mi_fprintf(out, "%10s: %7i\n", "numa nodes", _mi_os_numa_node_count());
   if (secs >= 0.0) _mi_fprintf(out, "%10s: %9.3f s\n", "elapsed", secs);
 
   double user_time;