-#include "smpi_process.hpp"
-
-#include <cstdio>
-
-namespace simgrid{
-namespace smpi{
-
-xbt_dict_t F2C::f2c_lookup_=nullptr;
-int F2C::f2c_id_=0;
-
-xbt_dict_t F2C::f2c_lookup(){
- return f2c_lookup_;
-}
-
-void F2C::set_f2c_lookup(xbt_dict_t dict){
- f2c_lookup_=dict;
-}
-
-void F2C::f2c_id_increment(){
- f2c_id_++;
-};
-
-int F2C::f2c_id(){
- return f2c_id_;
-};
-
-char* F2C::get_key(char* key, int id) {
- std::snprintf(key, KEY_SIZE, "%x",id);
- return key;
-}
-
-char* F2C::get_key_id(char* key, int id) {
- std::snprintf(key, KEY_SIZE, "%x_%d",id, smpi_process()->index());
- return key;
-}
-
-void F2C::delete_lookup(){
- xbt_dict_free(&f2c_lookup_);
-}
-
-xbt_dict_t F2C::lookup(){
- return f2c_lookup_;
-}
-
-void F2C::free_f(int id){
- char key[KEY_SIZE];
- xbt_dict_remove(f2c_lookup_, get_key(key, id));
-}
-
-int F2C::add_f(){
- if(f2c_lookup_==nullptr){
- f2c_lookup_=xbt_dict_new_homogeneous(nullptr);
- }
- char key[KEY_SIZE];
- xbt_dict_set(f2c_lookup_, get_key(key, f2c_id_), this, nullptr);
+#include "private.hpp"
+#include "src/smpi/include/smpi_actor.hpp"
+#include "src/instr/instr_smpi.hpp"
+
+const int mpi_in_place_ = -222;
+const int mpi_bottom_ = -111;
+const int mpi_status_ignore_ = 0;
+const int mpi_statuses_ignore_ = 0;
+
+namespace simgrid::smpi {
+
+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()
+{
+ allocate_lookup();
+ if (auto loc = smpi_process()->call_location(); 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;