edits from review

LLNL · Feb 4, 2025 · 06b344e · 06b344e
1 parent b5d0fdf
commit 06b344e
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/umpire/Umpire.cpp b/src/umpire/Umpire.cpp
@@ -256,16 +256,17 @@ void* find_pointer_from_name(Allocator allocator, const std::string& name)
 
 #if defined(UMPIRE_ENABLE_MPI)
 namespace {
-static std::map<int, MPI_Comm> cached_communicators{};
-
 std::map<int, MPI_Comm>& get_cached_communicators()
 {
+  static std::map<int, MPI_Comm> cached_communicators{};
   return cached_communicators;
 }
 } // namespace
 
 MPI_Comm get_communicator_for_allocator(Allocator a, MPI_Comm comm)
 {
+  std::map<int, MPI_Comm>& cached_communicators = get_cached_communicators();
+
   MPI_Comm c;
   auto scope = a.getAllocationStrategy()->getTraits().scope;
   int id = a.getId();
@@ -292,6 +293,8 @@ void cleanup_cached_communicators()
   for (auto c : comm) {
     MPI_Comm_free(&c.second);
   }
+
+  comm.clear();
 }
 #endif