Unconditionally call NumCPUs().

PiperOrigin-RevId: 566675122 Change-Id: Idc9d49cb537e965c493dc5a590e1bed608789050
google · Sep 19, 2023 · 7bfdb50 · 7bfdb50
1 parent 6d26800
commit 7bfdb50
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/tcmalloc/static_vars.cc b/tcmalloc/static_vars.cc
@@ -29,6 +29,7 @@
 #include "tcmalloc/internal/logging.h"
 #include "tcmalloc/internal/mincore.h"
 #include "tcmalloc/internal/numa.h"
+#include "tcmalloc/internal/sysinfo.h"
 #include "tcmalloc/malloc_extension.h"
 #include "tcmalloc/pagemap.h"
 #include "tcmalloc/sampler.h"
@@ -139,6 +140,9 @@ ABSL_ATTRIBUTE_COLD ABSL_ATTRIBUTE_NOINLINE void Static::SlowInitIfNecessary() {
     }
 
     CHECK_CONDITION(sizemap_.Init(size_classes));
+    // Verify we can determine the number of CPUs now, since we will need it
+    // later for per-CPU caches and initializing the cache topology.
+    (void)NumCPUs();
     numa_topology_.Init();
     cache_topology_.Init();
     sampledallocation_allocator_.Init(&arena_);