A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://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 86f819d520a3e2f619d19462fe0fe986b8792b5b..bdec55b5a2d9736e1fd9f25048aabbcc45a3b1c6 100644
(file)
--- a/
src/smpi/mpi/smpi_f2c.cpp
+++ b/
src/smpi/mpi/smpi_f2c.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-202
1
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-202
3
. 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. */
/* 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. */
@@
-6,14
+6,14
@@
#include "smpi_f2c.hpp"
#include "private.hpp"
#include "src/smpi/include/smpi_actor.hpp"
#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_
;
-
int mpi_status_ignore_
;
-
int mpi_statuses_ignore_
;
+
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{
-namespace smpi{
+namespace simgrid::smpi {
std::unique_ptr<F2C::f2c_lookup_type> F2C::f2c_lookup_ = nullptr;
int F2C::f2c_id_ = 0;
std::unique_ptr<F2C::f2c_lookup_type> F2C::f2c_lookup_ = nullptr;
int F2C::f2c_id_ = 0;
@@
-25,8
+25,9
@@
F2C::F2C() = default;
int F2C::add_f()
{
allocate_lookup();
int F2C::add_f()
{
allocate_lookup();
-
- my_f2c_id_ = f2c_id();
+ 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;
f2c_id_increment();
return my_f2c_id_;
(*f2c_lookup_)[my_f2c_id_] = this;
f2c_id_increment();
return my_f2c_id_;
@@
-54,5
+55,4
@@
F2C* F2C::f2c(int id)
return nullptr;
}
return nullptr;
}
-}
-}
+} // namespace simgrid::smpi