Remove explicit conversion to std::string when it's not required.

[simgrid.git] / src / smpi / include / smpi_f2c.hpp

diff --git a/src/smpi/include/smpi_f2c.hpp b/src/smpi/include/smpi_f2c.hpp
index 116d3d5..5b10ba7 100644 (file)
--- a/src/smpi/include/smpi_f2c.hpp
+++ b/src/smpi/include/smpi_f2c.hpp
@@ -1,6 +1,6 @@
 /* Handle Fortran - C conversion for MPI Types*/
 
-/* Copyright (c) 2010-2020. The SimGrid Team.
+/* Copyright (c) 2010-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,41 +9,55 @@
 #ifndef SMPI_F2C_HPP_INCLUDED
 #define SMPI_F2C_HPP_INCLUDED
 
+#include <memory>
 #include <unordered_map>
+#include <string>
 
-namespace simgrid{
-namespace smpi{
+namespace simgrid::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<int, F2C*>* f2c_lookup_;
+  static std::unique_ptr<f2c_lookup_type> f2c_lookup_;
   static int f2c_id_;
+  static f2c_lookup_type::size_type num_default_handles_;
   int my_f2c_id_ = -1;
+  bool deleted_ = false;
+  std::string call_location_;
 
 protected:
-  static void set_f2c_lookup(std::unordered_map<int, F2C*>* map) { f2c_lookup_ = map; }
-  static int f2c_id() { return f2c_id_; }
+  static void allocate_lookup()
+  {
+    if (not f2c_lookup_)
+      f2c_lookup_ = std::make_unique<f2c_lookup_type>();
+  }
+  int f2c_id() const { return my_f2c_id_; }
+  static int global_f2c_id() { return f2c_id_; }
   static void f2c_id_increment() { f2c_id_++; }
 
 public:
-  static void delete_lookup() { delete f2c_lookup_; }
-  static std::unordered_map<int, F2C*>* lookup() { return f2c_lookup_; }
+  void mark_as_deleted() { deleted_ = true; };
+  bool deleted() const { return deleted_; }
+  static f2c_lookup_type* lookup() { return f2c_lookup_.get(); }
   F2C();
   virtual ~F2C() = default;
+  virtual std::string name() const = 0;
+
+  int add_f();
+  static void free_f(int id) { if(id!=-1) f2c_lookup_->erase(id); }
+  int c2f();
 
-  // Override these to handle specific values.
-  virtual int add_f();
-  static void free_f(int id) { f2c_lookup_->erase(id); }
-  virtual int c2f();
-  static void print_f2c_lookup();
   // This method should be overridden in all subclasses to avoid casting the result when calling it.
   // 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 f2c_lookup_type::size_type get_num_default_handles() { return num_default_handles_; }
+  const std::string& call_location() const { return call_location_; }
 };
 
-}
-}
+} // namespace simgrid::smpi
 
 #endif