-/* Copyright (c) 2007-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#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_;
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_;
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 */
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);