[smpi] Use a std::unique_ptr for f2c_lookup_.

diff --git a/src/smpi/include/smpi_f2c.hpp b/src/smpi/include/smpi_f2c.hpp
index 97f3eb3..c839d1c 100644 (file)
--- a/src/smpi/include/smpi_f2c.hpp
+++ b/src/smpi/include/smpi_f2c.hpp
@@ -9,6 +9,7 @@
 #ifndef SMPI_F2C_HPP_INCLUDED
 #define SMPI_F2C_HPP_INCLUDED
 
+#include <memory>
 #include <unordered_map>
 
 namespace simgrid{
@@ -16,21 +17,26 @@ namespace smpi{
 
 class F2C {
 private:
+  using f2c_lookup_type = std::unordered_map<unsigned int, F2C*>;
+
   // We use a single lookup table for every type.
   // Beware of collisions if id in mpif.h is not unique
-  static std::unordered_map<unsigned int, F2C*>* f2c_lookup_;
+  static std::unique_ptr<f2c_lookup_type> f2c_lookup_;
   static int f2c_id_;
-  static std::unordered_map<unsigned int, F2C*>::size_type num_default_handles_;
+  static f2c_lookup_type::size_type num_default_handles_;
   int my_f2c_id_ = -1;
 
 protected:
-  static void set_f2c_lookup(std::unordered_map<unsigned int, F2C*>* map) { f2c_lookup_ = map; }
+  static void allocate_lookup()
+  {
+    if (not f2c_lookup_)
+      f2c_lookup_ = std::make_unique<f2c_lookup_type>();
+  }
   static int f2c_id() { return f2c_id_; }
   static void f2c_id_increment() { f2c_id_++; }
 
 public:
-  static void delete_lookup() { delete f2c_lookup_; f2c_lookup_ = nullptr ;}
-  static std::unordered_map<unsigned int, F2C*>* lookup() { return f2c_lookup_; }
+  static f2c_lookup_type* lookup() { return f2c_lookup_.get(); }
   F2C();
   virtual ~F2C() = default;
 
@@ -42,7 +48,7 @@ public:
   // For the default one, the MPI_*_NULL returned is assumed to be NULL.
   static F2C* f2c(int id);
   static void finish_initialization() { num_default_handles_ = f2c_lookup_->size(); }
-  static std::unordered_map<unsigned int, F2C*>::size_type get_num_default_handles() { return num_default_handles_;}
+  static f2c_lookup_type::size_type get_num_default_handles() { return num_default_handles_; }
 };
 
 }

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 966df24..112ca0f 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -652,7 +652,6 @@ void SMPI_finalize()
         }
       }
     }
-    simgrid::smpi::F2C::delete_lookup();
   }
 }
 

diff --git a/src/smpi/mpi/smpi_f2c.cpp b/src/smpi/mpi/smpi_f2c.cpp
index ff10198..86f819d 100644 (file)
--- a/src/smpi/mpi/smpi_f2c.cpp
+++ b/src/smpi/mpi/smpi_f2c.cpp
@@ -15,17 +15,16 @@ int mpi_statuses_ignore_;
 namespace simgrid{
 namespace smpi{
 
-std::unordered_map<unsigned int, F2C*>* F2C::f2c_lookup_ = nullptr;
+std::unique_ptr<F2C::f2c_lookup_type> F2C::f2c_lookup_    = nullptr;
 int F2C::f2c_id_ = 0;
-std::unordered_map<unsigned int, F2C*>::size_type F2C::num_default_handles_ = 0;
+F2C::f2c_lookup_type::size_type F2C::num_default_handles_ = 0;
 
 // Keep it non trivially-constructible, or it will break MC+smpi on FreeBSD with Clang (don't ask why)
 F2C::F2C() = default;
 
 int F2C::add_f()
 {
-  if (f2c_lookup_ == nullptr)
-    f2c_lookup_ = new std::unordered_map<unsigned int, F2C*>();
+  allocate_lookup();
 
   my_f2c_id_                 = f2c_id();
   (*f2c_lookup_)[my_f2c_id_] = this;
@@ -35,9 +34,7 @@ int F2C::add_f()
 
 int F2C::c2f()
 {
-  if (f2c_lookup_ == nullptr) {
-    f2c_lookup_ = new std::unordered_map<unsigned int, F2C*>();
-  }
+  allocate_lookup();
 
   if(my_f2c_id_==-1)
     /* this function wasn't found, add it */
@@ -48,8 +45,7 @@ int F2C::c2f()
 
 F2C* F2C::f2c(int id)
 {
-  if (f2c_lookup_ == nullptr)
-    f2c_lookup_ = new std::unordered_map<unsigned int, F2C*>();
+  allocate_lookup();
 
   if(id >= 0){
     auto comm = f2c_lookup_->find(id);