int PMPI_Init(int *argc, char ***argv)
{
- xbt_assert(simgrid::s4u::Engine::isInitialized(),
+ xbt_assert(simgrid::s4u::Engine::is_initialized(),
"Your MPI program was not properly initialized. The easiest is to use smpirun to start it.");
// PMPI_Init is called only once per SMPI process
int already_init;
if(already_init == 0){
simgrid::smpi::Process::init(argc, argv);
smpi_process()->mark_as_initialized();
- int rank = simgrid::s4u::Actor::self()->getPid();
+ int rank = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_init(rank);
TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("init"));
TRACE_smpi_comm_out(rank);
TRACE_smpi_computing_init(rank);
+ TRACE_smpi_sleeping_init(rank);
smpi_bench_begin();
}
int PMPI_Finalize()
{
smpi_bench_end();
- int rank = simgrid::s4u::Actor::self()->getPid();
+ int rank = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("finalize"));
smpi_process()->finalize();
int PMPI_Get_library_version (char *version,int *len){
smpi_bench_end();
- snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-2017",
+ snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-2018",
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
*len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version);
smpi_bench_begin();
if (flag == nullptr) {
return MPI_ERR_ARG;
} else {
- *flag = simgrid::s4u::Actor::self()->getPid() == 1; // FIXME: I don't think this is correct: This just returns true if the process ID is 1,
- // regardless of whether this process called MPI_Thread_Init() or not.
+ *flag = simgrid::s4u::this_actor::get_pid() ==
+ 1; // FIXME: I don't think this is correct: This just returns true if the process ID is 1,
+ // regardless of whether this process called MPI_Thread_Init() or not.
return MPI_SUCCESS;
}
}
smpi_bench_end();
// FIXME: should kill all processes in comm instead
smx_actor_t process = SIMIX_process_self();
- simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); });
+ simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); });
return MPI_SUCCESS;
}
int PMPI_Get_processor_name(char *name, int *resultlen)
{
- strncpy(name, sg_host_self()->getCname(), strlen(sg_host_self()->getCname()) < MPI_MAX_PROCESSOR_NAME - 1
- ? strlen(sg_host_self()->getCname()) + 1
- : MPI_MAX_PROCESSOR_NAME - 1);
+ strncpy(name, sg_host_self()->get_cname(),
+ strlen(sg_host_self()->get_cname()) < MPI_MAX_PROCESSOR_NAME - 1 ? strlen(sg_host_self()->get_cname()) + 1
+ : MPI_MAX_PROCESSOR_NAME - 1);
*resultlen = strlen(name) > MPI_MAX_PROCESSOR_NAME ? MPI_MAX_PROCESSOR_NAME : strlen(name);
return MPI_SUCCESS;