Finally use plain ints for f2c keys.

[simgrid.git] / src / smpi / mpi / smpi_f2c.cpp

diff --git a/src/smpi/mpi/smpi_f2c.cpp b/src/smpi/mpi/smpi_f2c.cpp
index 35246a7..bff67c3 100644 (file)
--- a/src/smpi/mpi/smpi_f2c.cpp
+++ b/src/smpi/mpi/smpi_f2c.cpp
@@ -7,8 +7,6 @@
 #include "private.hpp"
 #include "src/smpi/include/smpi_actor.hpp"
 
-#include <cstdio>
-
 int mpi_in_place_;
 int mpi_bottom_;
 int mpi_status_ignore_;
@@ -17,18 +15,18 @@ int mpi_statuses_ignore_;
 namespace simgrid{
 namespace smpi{
 
-std::unordered_map<std::string, F2C*>* F2C::f2c_lookup_ = nullptr;
+std::unordered_map<int, F2C*>* F2C::f2c_lookup_ = nullptr;
 int F2C::f2c_id_ = 0;
 
 // Keep it non trivially-constructible, or it will break MC+smpi on FreeBSD with Clang (don't ask why)
 F2C::F2C() = default;
 
-std::unordered_map<std::string, F2C*>* F2C::f2c_lookup()
+std::unordered_map<int, F2C*>* F2C::f2c_lookup()
 {
   return f2c_lookup_;
 }
 
-void F2C::set_f2c_lookup(std::unordered_map<std::string, F2C*>* map)
+void F2C::set_f2c_lookup(std::unordered_map<int, F2C*>* map)
 {
   f2c_lookup_ = map;
 }
@@ -45,23 +43,23 @@ void F2C::delete_lookup(){
   delete f2c_lookup_;
 }
 
-std::unordered_map<std::string, F2C*>* F2C::lookup()
+std::unordered_map<int, F2C*>* F2C::lookup()
 {
   return f2c_lookup_;
 }
 
 void F2C::free_f(int id)
 {
-  f2c_lookup_->erase(get_key(id));
+  f2c_lookup_->erase(id);
 }
 
 int F2C::add_f()
 {
   if (f2c_lookup_ == nullptr)
-    f2c_lookup_ = new std::unordered_map<std::string, F2C*>();
+    f2c_lookup_ = new std::unordered_map<int, F2C*>();
 
-  my_f2c_id_=f2c_id_;
-  (*f2c_lookup_)[get_my_key()] = this;
+  my_f2c_id_                 = f2c_id();
+  (*f2c_lookup_)[my_f2c_id_] = this;
   f2c_id_increment();
   return my_f2c_id_;
 }
@@ -69,7 +67,7 @@ int F2C::add_f()
 int F2C::c2f()
 {
   if (f2c_lookup_ == nullptr) {
-    f2c_lookup_ = new std::unordered_map<std::string, F2C*>();
+    f2c_lookup_ = new std::unordered_map<int, F2C*>();
   }
 
   if(my_f2c_id_==-1)
@@ -82,10 +80,10 @@ int F2C::c2f()
 F2C* F2C::f2c(int id)
 {
   if (f2c_lookup_ == nullptr)
-    f2c_lookup_ = new std::unordered_map<std::string, F2C*>();
+    f2c_lookup_ = new std::unordered_map<int, F2C*>();
 
   if(id >= 0){
-    auto comm = f2c_lookup_->find(get_key(id));
+    auto comm = f2c_lookup_->find(id);
     return comm == f2c_lookup_->end() ? nullptr : comm->second;
   }else
     return nullptr;