-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
{
xbt_assert(simgrid::s4u::Engine::is_initialized(),
"Your MPI program was not properly initialized. The easiest is to use smpirun to start it.");
+
// Init is called only once per SMPI process
if (not smpi_process()->initializing()){
- simgrid::smpi::ActorExt::init(argc, argv);
+ simgrid::smpi::ActorExt::init();
}
if (not smpi_process()->initialized()){
- 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);
+ int rank_traced = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_init(rank_traced);
+ TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("init"));
+ TRACE_smpi_comm_out(rank_traced);
+ TRACE_smpi_computing_init(rank_traced);
+ TRACE_smpi_sleeping_init(rank_traced);
smpi_bench_begin();
smpi_process()->mark_as_initialized();
}
int PMPI_Finalize()
{
smpi_bench_end();
- int rank = simgrid::s4u::this_actor::get_pid();
- TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("finalize"));
+ int rank_traced = simgrid::s4u::this_actor::get_pid();
+ TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::NoOpTIData("finalize"));
smpi_process()->finalize();
- TRACE_smpi_comm_out(rank);
- TRACE_smpi_finalize(rank);
+ TRACE_smpi_comm_out(rank_traced);
+ TRACE_smpi_finalize(rank_traced);
return MPI_SUCCESS;
}
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-2018",
+ snprintf(version, MPI_MAX_LIBRARY_VERSION_STRING, "SMPI Version %d.%d. Copyright The Simgrid Team 2007-2019",
SIMGRID_VERSION_MAJOR, SIMGRID_VERSION_MINOR);
*len = strlen(version) > MPI_MAX_LIBRARY_VERSION_STRING ? MPI_MAX_LIBRARY_VERSION_STRING : strlen(version);
smpi_bench_begin();