static std::map</*process_id*/ ActorPtr, simgrid::smpi::Process*> process_data;
int process_count = 0;
+static int smpi_exit_status = 0;
int smpi_universe_size = 0;
extern double smpi_total_benched_time;
xbt_os_timer_t global_timer;
void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t) = &smpi_comm_copy_buffer_callback;
-void smpi_add_process(ActorPtr actor)
-{
- process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)});
- // smpi_deployment_register_process("master_mpi", 0, actor);
-}
-
int smpi_process_count()
{
return process_count;
smpi_bench_destroy();
smpi_shared_destroy();
smpi_deployment_cleanup_instances();
- for (auto& pair : process_data) {
- auto& process = pair.second;
- if (process->comm_self() != MPI_COMM_NULL) {
- simgrid::smpi::Comm::destroy(process->comm_self());
- }
- if (process->comm_intra() != MPI_COMM_NULL) {
- simgrid::smpi::Comm::destroy(process->comm_intra());
- }
- xbt_os_timer_free(process->timer());
- xbt_mutex_destroy(process->mailboxes_mutex());
- }
- process_data.clear();
if (simgrid::smpi::Colls::smpi_coll_cleanup_callback != nullptr)
simgrid::smpi::Colls::smpi_coll_cleanup_callback();
if (res != 0){
XBT_WARN("SMPI process did not return 0. Return value : %d", res);
smpi_process()->set_return_value(res);
+ if (smpi_exit_status == 0)
+ smpi_exit_status = res;
}
return 0;
}
SMPI_init();
SIMIX_launch_application(argv[2]);
SMPI_app_instance_register(smpi_default_instance_name, nullptr,
- SIMIX_process_count()); // This call has a side effect on process_count...
+ process_data.size()); // This call has a side effect on process_count...
MPI_COMM_WORLD = *smpi_deployment_comm_world(smpi_default_instance_name);
smpi_universe_size = process_count;
"You may want to use sampling functions or trace replay to reduce this.");
}
}
- int ret = 0;
- for (auto& pair : process_data) {
- auto& smpi_process = pair.second;
- if (smpi_process->return_value() != 0) {
- ret = smpi_process->return_value(); // return first non 0 value
- break;
- }
- }
smpi_global_destroy();
TRACE_end();
- return ret;
+ return smpi_exit_status;
}
// Called either directly from the user code, or from the code called by smpirun
void SMPI_init(){
simgrid::s4u::Actor::onCreation.connect([](simgrid::s4u::ActorPtr actor) {
- smpi_add_process(actor);
+ if (not actor->isDaemon()) {
+ process_data.insert({actor, new simgrid::smpi::Process(actor, nullptr)});
+ }
});
+ simgrid::s4u::Actor::onDestruction.connect([](simgrid::s4u::ActorPtr actor) {
+ auto it = process_data.find(actor);
+ if (it != process_data.end()) {
+ delete it->second;
+ process_data.erase(it);
+ }
+ });
+
smpi_init_options();
smpi_global_init();
smpi_check_options();