Process::~Process()
{
+ if (comm_self_ != MPI_COMM_NULL)
+ simgrid::smpi::Comm::destroy(comm_self_);
+ if (comm_intra_ != MPI_COMM_NULL)
+ simgrid::smpi::Comm::destroy(comm_intra_);
xbt_os_timer_free(timer_);
xbt_mutex_destroy(mailboxes_mutex_);
}
void Process::set_data(int* argc, char*** argv)
{
instance_id_ = std::string((*argv)[1]);
- comm_world_ = smpi_deployment_comm_world(instance_id_.c_str());
- msg_bar_t barrier = smpi_deployment_finalization_barrier(instance_id_.c_str());
+ comm_world_ = smpi_deployment_comm_world(instance_id_);
+ msg_bar_t barrier = smpi_deployment_finalization_barrier(instance_id_);
if (barrier != nullptr) // don't overwrite the current one if the instance has none
finalization_barrier_ = barrier;
argv_ = argv;
// set the process attached to the mailbox
mailbox_small_->setReceiver(process_);
- XBT_DEBUG("<%lu> New process in the game: %p", process_->getPid(), process_.get());
+ XBT_DEBUG("<%ld> SMPI process has been initialized: %p", process_->getPid(), process_.get());
}
/** @brief Prepares the current process for termination. */
void Process::finalize()
{
state_ = SMPI_FINALIZED;
- XBT_DEBUG("<%lu> Process left the game", process_->getPid());
+ XBT_DEBUG("<%ld> Process left the game", process_->getPid());
// This leads to an explosion of the search graph which cannot be reduced:
if(MC_is_active() || MC_record_replay_is_active())
return papi_event_set_;
}
-papi_counter_t& smpi_process_papi_counters()
+papi_counter_t& Process::papi_counters()
{
return papi_counter_data_;
}
return finalization_barrier_;
}
-int Process::return_value(){
- return return_value_;
-}
-
-void Process::set_return_value(int val){
- return_value_=val;
-}
-
void Process::init(int *argc, char ***argv){
if (smpi_process_count() == 0) {
// 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.
Process* process = smpi_process_remote(proc);
- int my_proc_id = proc->getPid();
if(smpi_privatize_global_variables == SMPI_PRIVATIZE_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(my_proc_id);
+ SMPI_switch_data_segment(proc);
}
process->set_data(argc, argv);
}
- xbt_assert(smpi_process(),
- "smpi_process() returned nullptr. You probably gave a nullptr parameter to MPI_Init. "
- "Although it's required by MPI-2, this is currently not supported by SMPI.");
+ xbt_assert(smpi_process(), "smpi_process() returned nullptr. You probably gave a nullptr parameter to MPI_Init. "
+ "Although it's required by MPI-2, this is currently not supported by SMPI. "
+ "Please use MPI_Init(&argc, &argv) as usual instead.");
}
}