XBT_PUBLIC void smpi_process_init(int* argc, char*** argv);
/* Trace replay specific stuff */
-XBT_PUBLIC void smpi_replay_init(int* argc, char*** argv); // Only initialization
-XBT_PUBLIC void smpi_replay_main(int* argc, char*** argv); // Launch the replay once init is done
-XBT_PUBLIC void smpi_replay_run(int* argc, char*** argv); // Both init and start
+XBT_PUBLIC void smpi_replay_init(const char* instance_id, int rank, double start_delay_flops); // Only initialization
+XBT_PUBLIC void smpi_replay_main(int rank, const char* trace_filename); // Launch the replay once init is done
+XBT_PUBLIC void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops,
+ const char* trace_filename); // Both init and start
XBT_PUBLIC void SMPI_app_instance_register(const char* name, xbt_main_func_t code, int num_processes);
XBT_PUBLIC void SMPI_init();
{
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;
}
public:
explicit ActorExt(simgrid::s4u::ActorPtr actor, simgrid::s4u::Barrier* barrier);
~ActorExt();
- void set_data(int* argc, char*** argv);
+ void set_data(const char* instance_id);
void finalize();
int finalized();
int initializing();
void set_comm_intra(MPI_Comm comm);
void set_sampling(int s);
int sampling();
- static void init(int* argc, char*** argv);
+ static void init();
simgrid::s4u::ActorPtr get_actor();
int get_optind();
void set_optind(int optind);
xbt_mutex_destroy(mailboxes_mutex_);
}
-void ActorExt::set_data(int* argc, char*** argv)
+void ActorExt::set_data(const char* instance_id)
{
- instance_id_ = std::string((*argv)[1]);
+ instance_id_ = std::string(instance_id);
comm_world_ = smpi_deployment_comm_world(instance_id_);
simgrid::s4u::Barrier* barrier = smpi_deployment_finalization_barrier(instance_id_);
if (barrier != nullptr) // don't overwrite the current one if the instance has none
finalization_barrier_ = barrier;
- if (*argc > 3) {
- memmove(&(*argv)[0], &(*argv)[2], sizeof(char*) * (*argc - 2));
- (*argv)[(*argc) - 1] = nullptr;
- (*argv)[(*argc) - 2] = nullptr;
- }
- (*argc) -= 2;
// set the process attached to the mailbox
mailbox_small_->set_receiver(actor_);
XBT_DEBUG("<%ld> SMPI process has been initialized: %p", actor_->get_pid(), actor_.get());
return sampling_;
}
-void ActorExt::init(int* argc, char*** argv)
+void ActorExt::init()
{
-
if (smpi_process_count() == 0) {
xbt_die("SimGrid was not initialized properly before entering MPI_Init. Aborting, please check compilation process "
"and use smpirun\n");
}
- if (argc != nullptr && argv != nullptr) {
- simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self();
- proc->get_impl()->context_->set_cleanup(&SIMIX_process_cleanup);
- // cheinrich: I'm not sure what the impact of the SMPI_switch_data_segment on this call is. I moved
- // this up here so that I can set the privatized region before the switch.
- ActorExt* process = smpi_process_remote(proc);
- //if we are in MPI_Init and argc handling has already been done.
- if (process->initialized())
- return;
-
- process->state_ = SmpiProcessState::INITIALIZING;
-
- char* instance_id = (*argv)[1];
- try {
- int rank = std::stoi(std::string((*argv)[2]));
- smpi_deployment_register_process(instance_id, rank, proc);
- } catch (std::invalid_argument& ia) {
- throw std::invalid_argument(std::string("Invalid rank: ") + (*argv)[2]);
- }
- if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
- /* Now using the segment index of this process */
- process->set_privatized_region(smpi_init_global_memory_segment_process());
- /* Done at the process's creation */
- SMPI_switch_data_segment(proc);
- }
+ simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self();
+ proc->get_impl()->context_->set_cleanup(&SIMIX_process_cleanup);
+ // cheinrich: I'm not sure what the impact of the SMPI_switch_data_segment on this call is. I moved
+ // this up here so that I can set the privatized region before the switch.
+ ActorExt* process = smpi_process_remote(proc);
+ // if we are in MPI_Init and argc handling has already been done.
+ if (process->initialized())
+ return;
+
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
+ /* Now using the segment index of this process */
+ process->set_privatized_region(smpi_init_global_memory_segment_process());
+ /* Done at the process's creation */
+ SMPI_switch_data_segment(proc);
+ }
+
+ const char* instance_id = simgrid::s4u::Actor::self()->get_property("instance_id");
+ const int rank = xbt_str_parse_int(simgrid::s4u::Actor::self()->get_property("rank"), "Cannot parse rank");
+
+ process->state_ = SmpiProcessState::INITIALIZING;
+ smpi_deployment_register_process(instance_id, rank, proc);
- process->set_data(argc, argv);
- }
+ process->set_data(instance_id);
}
int ActorExt::get_optind()
}
void smpi_process_init(int *argc, char ***argv){
- simgrid::smpi::ActorExt::init(argc, argv);
+ simgrid::smpi::ActorExt::init();
}
void * smpi_process_get_user_data(){
typedef int (* smpi_c_entry_point_type)(int argc, char **argv);
typedef void (*smpi_fortran_entry_point_type)();
-static int smpi_run_entry_point(smpi_entry_point_type entry_point, std::vector<std::string> args)
+static int smpi_run_entry_point(smpi_entry_point_type entry_point, const std::string& executable_path,
+ std::vector<std::string> args)
{
// copy C strings, we need them writable
std::vector<char*>* args4argv = new std::vector<char*>(args.size());
std::transform(begin(args), end(args), begin(*args4argv), [](const std::string& s) { return xbt_strdup(s.c_str()); });
+ // set argv[0] to executable_path
+ xbt_free((*args4argv)[0]);
+ (*args4argv)[0] = xbt_strdup(executable_path.c_str());
+
#if !SMPI_IFORT
// take a copy of args4argv to keep reference of the allocated strings
const std::vector<char*> args2str(*args4argv);
args4argv->push_back(nullptr);
char** argv = args4argv->data();
- simgrid::smpi::ActorExt::init(&argc, &argv);
+ simgrid::smpi::ActorExt::init();
#if SMPI_IFORT
for_rtl_init_ (&argc, argv);
#elif SMPI_FLANG
}
#endif
-static void smpi_init_privatization_dlopen(std::string executable)
+static void smpi_init_privatization_dlopen(const std::string& executable)
{
// Prepare the copy of the binary (get its size)
struct stat fdin_stat;
simix_global->default_function = [executable, fdin_size](std::vector<std::string> args) {
return std::function<void()>([executable, fdin_size, args] {
-
// Copy the dynamic library:
std::string target_executable =
executable + "_" + std::to_string(getpid()) + "_" + std::to_string(rank) + ".so";
smpi_entry_point_type entry_point = smpi_resolve_function(handle);
if (not entry_point)
xbt_die("Could not resolve entry point");
- smpi_run_entry_point(entry_point, args);
+ smpi_run_entry_point(entry_point, executable, args);
});
};
}
-static void smpi_init_privatization_no_dlopen(std::string executable)
+static void smpi_init_privatization_no_dlopen(const std::string& executable)
{
if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP)
smpi_prepare_global_memory_segment();
smpi_backup_global_memory_segment();
// Execute the same entry point for each simulated process:
- simix_global->default_function = [entry_point](std::vector<std::string> args) {
- return std::function<void()>([entry_point, args] { smpi_run_entry_point(entry_point, args); });
+ simix_global->default_function = [entry_point, executable](std::vector<std::string> args) {
+ return std::function<void()>(
+ [entry_point, executable, args] { smpi_run_entry_point(entry_point, executable, args); });
};
}
static std::unordered_map<aid_t, simgrid::smpi::replay::RequestStorage> storage;
/** @brief Only initialize the replay, don't do it for real */
-void smpi_replay_init(int* argc, char*** argv)
+void smpi_replay_init(const char* instance_id, int rank, double start_delay_flops)
{
if (not smpi_process()->initializing()){
- simgrid::smpi::ActorExt::init(argc, argv);
+ simgrid::s4u::Actor::self()->set_property("instance_id", instance_id);
+ simgrid::s4u::Actor::self()->set_property("rank", std::to_string(rank));
+ simgrid::smpi::ActorExt::init();
}
smpi_process()->mark_as_initialized();
smpi_process()->set_replaying(true);
xbt_replay_action_register("compute", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::ComputeAction().execute(action); });
//if we have a delayed start, sleep here.
- if(*argc>2){
- double value = xbt_str_parse_double((*argv)[2], "%s is not a double");
- XBT_VERB("Delayed start for instance - Sleeping for %f flops ",value );
- smpi_execute_flops(value);
+ if (start_delay_flops > 0) {
+ XBT_VERB("Delayed start for instance - Sleeping for %f flops ", start_delay_flops);
+ smpi_execute_flops(start_delay_flops);
} else {
// Wait for the other actors to initialize also
simgrid::s4u::this_actor::yield();
}
/** @brief actually run the replay after initialization */
-void smpi_replay_main(int* argc, char*** argv)
+void smpi_replay_main(int rank, const char* trace_filename)
{
static int active_processes = 0;
active_processes++;
storage[simgrid::s4u::this_actor::get_pid()] = simgrid::smpi::replay::RequestStorage();
- simgrid::xbt::replay_runner(*argc, *argv);
+ std::string rank_string = std::to_string(rank);
+ simgrid::xbt::replay_runner(rank_string.c_str(), trace_filename);
/* and now, finalize everything */
/* One active process will stop. Decrease the counter*/
}
/** @brief chain a replay initialization and a replay start */
-void smpi_replay_run(int* argc, char*** argv)
+void smpi_replay_run(const char* instance_id, int rank, double start_delay_flops, const char* trace_filename)
{
- smpi_replay_init(argc, argv);
- smpi_replay_main(argc, argv);
+ smpi_replay_init(instance_id, rank, start_delay_flops);
+ smpi_replay_main(rank, trace_filename);
}
fi
echo " <actor host=\"${host}\" function=\"$i\"> <!-- function name used only for logging -->
- <argument value=\"smpirun\"/> <!-- instance -->
- <argument value=\"$i\"/> <!-- rank -->" >> ${APPLICATIONTMP}
+ <prop id=\"instance_id\" value=\"smpirun\"/>
+ <prop id=\"rank\" value=\"$i\"/>" >> ${APPLICATIONTMP}
if [ ${REPLAY} = 1 ]; then
if [ ${NUMTRACES} -gt 1 ]; then
echo " <argument value=\"$(echo $hosttraces|cut -d' ' -f$j)\"/>" >> ${APPLICATIONTMP}