Merge branch 'master' of framagit.org:simgrid/simgrid

[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 680c850e98f4cd9956050c6c1f7ab370329d0975..d3b04ace684c20df33770325d38aa74ddebc2a07 100644 (file)
--- a/src/smpi/mpi/smpi_f2c.cpp
+++ b/src/smpi/mpi/smpi_f2c.cpp
@@ -6,6 +6,7 @@
 #include "smpi_f2c.hpp"
 #include "private.hpp"
 #include "src/smpi/include/smpi_actor.hpp"
+#include "src/instr/instr_smpi.hpp"
 
 int mpi_in_place_;
 int mpi_bottom_;
@@ -15,18 +16,20 @@ int mpi_statuses_ignore_;
 namespace simgrid{
 namespace smpi{
 
-std::unordered_map<int, F2C*>* F2C::f2c_lookup_ = nullptr;
+std::unique_ptr<F2C::f2c_lookup_type> F2C::f2c_lookup_    = nullptr;
 int F2C::f2c_id_ = 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<int, F2C*>();
-
-  my_f2c_id_                 = f2c_id();
+  allocate_lookup();
+  auto loc = smpi_process()->call_location();
+  if(loc && loc->linenumber != 0)
+    call_location_= std::string (loc->filename + ":" + std::to_string(loc->linenumber));
+  my_f2c_id_                 = global_f2c_id();
   (*f2c_lookup_)[my_f2c_id_] = this;
   f2c_id_increment();
   return my_f2c_id_;
@@ -34,9 +37,7 @@ int F2C::add_f()
 
 int F2C::c2f()
 {
-  if (f2c_lookup_ == nullptr) {
-    f2c_lookup_ = new std::unordered_map<int, F2C*>();
-  }
+  allocate_lookup();
 
   if(my_f2c_id_==-1)
     /* this function wasn't found, add it */
@@ -47,8 +48,7 @@ int F2C::c2f()
 
 F2C* F2C::f2c(int id)
 {
-  if (f2c_lookup_ == nullptr)
-    f2c_lookup_ = new std::unordered_map<int, F2C*>();
+  allocate_lookup();
 
   if(id >= 0){
     auto comm = f2c_lookup_->find(id);