namespace simgrid {
namespace smpi {
-ActorExt::ActorExt(s4u::ActorPtr actor, s4u::Barrier* finalization_barrier)
- : finalization_barrier_(finalization_barrier), actor_(actor)
+ActorExt::ActorExt(s4u::ActorPtr actor) : actor_(actor)
{
mailbox_ = s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid()));
mailbox_small_ = s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid()));
ActorExt::~ActorExt()
{
+ TRACE_smpi_finalize(actor_->get_pid());
+
if (comm_self_ != MPI_COMM_NULL)
simgrid::smpi::Comm::destroy(comm_self_);
if (comm_intra_ != MPI_COMM_NULL)
xbt_os_timer_free(timer_);
}
-void ActorExt::set_data(const std::string& instance_id)
-{
- instance_id_ = 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;
-
- // 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());
-}
-
/** @brief Prepares the current process for termination. */
void ActorExt::finalize()
{
state_ = SmpiProcessState::FINALIZED;
XBT_DEBUG("<%ld> Process left the game", actor_->get_pid());
- // This leads to an explosion of the search graph which cannot be reduced:
- if (MC_is_active() || MC_record_replay_is_active())
- return;
- // wait for all pending asynchronous comms to finish
- finalization_barrier_->wait();
+ smpi_deployment_unregister_process(instance_id_);
}
/** @brief Check if a process is finalized */
simgrid::s4u::ActorPtr self = simgrid::s4u::Actor::self();
// 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* ext = smpi_process_remote(self);
+ ActorExt* ext = smpi_process();
// if we are in MPI_Init and argc handling has already been done.
if (ext->initialized())
return;
SMPI_switch_data_segment(self);
}
- std::string instance_id = self->get_property("instance_id");
- const int rank = xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank");
+ ext->instance_id_ = self->get_property("instance_id");
+ const int rank = xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank");
ext->state_ = SmpiProcessState::INITIALIZING;
- smpi_deployment_register_process(instance_id, rank, self);
+ smpi_deployment_register_process(ext->instance_id_, rank, self);
- ext->set_data(instance_id);
+ ext->comm_world_ = smpi_deployment_comm_world(ext->instance_id_);
+
+ // set the process attached to the mailbox
+ ext->mailbox_small_->set_receiver(ext->actor_);
+ XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_.get());
}
int ActorExt::get_optind()