#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"
void TRACE_smpi_set_category(const char *category)
{
//need to end bench otherwise categories for execution tasks are wrong
- smpi_bench_end();
+ const SmpiBenchGuard suspend_bench;
+
if (category != nullptr) {
// declare category
TRACE_category(category);
smpi_process()->set_tracing_category(category);
}
- //begin bench after changing process's category
- smpi_bench_begin();
}
/* PMPI User level calls */
}
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();
int PMPI_Finalize()
{
smpi_bench_end();
- int 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"));
+ 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_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++){
- 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
- smx_actor_t actor = SIMIX_process_self();
- simgrid::kernel::actor::simcall([actor] { actor->exit(); });
+ simgrid::kernel::actor::simcall([myself] { myself->exit(); });
return MPI_SUCCESS;
}
int PMPI_Alloc_mem(MPI_Aint size, MPI_Info /*info*/, void* baseptr)
{
+ CHECK_NEGATIVE(1, MPI_ERR_COUNT, size)
void *ptr = xbt_malloc(size);
*static_cast<void**>(baseptr) = ptr;
return MPI_SUCCESS;
int PMPI_Keyval_free(int* keyval) {
CHECK_NULL(1, MPI_ERR_ARG, keyval)
- CHECK_MPI_NULL(1, MPI_KEYVAL_INVALID, MPI_ERR_KEYVAL, *keyval)
+ CHECK_VAL(1, MPI_KEYVAL_INVALID, MPI_ERR_KEYVAL, *keyval)
return simgrid::smpi::Keyval::keyval_free<simgrid::smpi::Comm>(keyval);
}