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
Add flag to provide an optional barrier in MPI_Finalize.
[simgrid.git]
/
src
/
smpi
/
bindings
/
smpi_pmpi.cpp
diff --git
a/src/smpi/bindings/smpi_pmpi.cpp
b/src/smpi/bindings/smpi_pmpi.cpp
index 6b1c4dc0362c0d9307ce05e6bba92a8664a59d7f..ffe62aadef22304a0551b5d2462d7b43cd429395 100644
(file)
--- a/
src/smpi/bindings/smpi_pmpi.cpp
+++ b/
src/smpi/bindings/smpi_pmpi.cpp
@@
-11,6
+11,7
@@
#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
#include "smpi_status.hpp"
#include "smpi_comm.hpp"
#include "smpi_datatype_derived.hpp"
#include "smpi_status.hpp"
+#include "smpi_coll.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/smpi/include/smpi_actor.hpp"
#include "src/kernel/actor/ActorImpl.hpp"
#include "src/smpi/include/smpi_actor.hpp"
@@
-51,8
+52,7
@@
int PMPI_Init(int*, char***)
}
simgrid::smpi::ActorExt::init();
}
simgrid::smpi::ActorExt::init();
- int rank_traced = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_init(rank_traced, __func__);
+ TRACE_smpi_init(simgrid::s4u::this_actor::get_pid(), __func__);
smpi_bench_begin();
smpi_process()->mark_as_initialized();
smpi_bench_begin();
smpi_process()->mark_as_initialized();
@@
-64,9
+64,12
@@
int PMPI_Init(int*, char***)
int PMPI_Finalize()
{
smpi_bench_end();
int PMPI_Finalize()
{
smpi_bench_end();
-
in
t rank_traced = simgrid::s4u::this_actor::get_pid();
+
aid_
t rank_traced = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize"));
TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize"));
+ if(simgrid::config::get_value<bool>("smpi/finalization-barrier"))
+ simgrid::smpi::colls::barrier(MPI_COMM_WORLD);
+
smpi_process()->finalize();
TRACE_smpi_comm_out(rank_traced);
smpi_process()->finalize();
TRACE_smpi_comm_out(rank_traced);
@@
-129,14
+132,14
@@
int PMPI_Abort(MPI_Comm comm, int /*errorcode*/)
smpi_bench_end();
CHECK_COMM(1)
XBT_WARN("MPI_Abort was called, something went probably wrong in this simulation ! Killing all processes sharing the same MPI_COMM_WORLD");
smpi_bench_end();
CHECK_COMM(1)
XBT_WARN("MPI_Abort was called, something went probably wrong in this simulation ! Killing all processes sharing the same MPI_COMM_WORLD");
+ smx_actor_t myself = SIMIX_process_self();
for (int i = 0; i < comm->size(); i++){
for (int i = 0; i < comm->size(); i++){
- smx_actor_t actor =
comm->group()->actor(i)->get_impl(
);
- if
(actor != SIMIX_process_self()
)
+ smx_actor_t actor =
simgrid::kernel::actor::ActorImpl::by_pid(comm->group()->actor(i)
);
+ if
(actor != nullptr && actor != myself
)
simgrid::kernel::actor::simcall([actor] { actor->exit(); });
}
// now ourself
simgrid::kernel::actor::simcall([actor] { actor->exit(); });
}
// now ourself
- smx_actor_t actor = SIMIX_process_self();
- simgrid::kernel::actor::simcall([actor] { actor->exit(); });
+ simgrid::kernel::actor::simcall([myself] { myself->exit(); });
return MPI_SUCCESS;
}
return MPI_SUCCESS;
}
@@
-250,7
+253,7
@@
int PMPI_Keyval_create(MPI_Copy_function* copy_fn, MPI_Delete_function* delete_f
int PMPI_Keyval_free(int* keyval) {
CHECK_NULL(1, MPI_ERR_ARG, keyval)
int PMPI_Keyval_free(int* keyval) {
CHECK_NULL(1, MPI_ERR_ARG, keyval)
- CHECK_
MPI_NUL
L(1, MPI_KEYVAL_INVALID, MPI_ERR_KEYVAL, *keyval)
+ CHECK_
VA
L(1, MPI_KEYVAL_INVALID, MPI_ERR_KEYVAL, *keyval)
return simgrid::smpi::Keyval::keyval_free<simgrid::smpi::Comm>(keyval);
}
return simgrid::smpi::Keyval::keyval_free<simgrid::smpi::Comm>(keyval);
}