-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-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. */
namespace simgrid {
namespace smpi {
-using simgrid::s4u::Actor;
-using simgrid::s4u::ActorPtr;
-
-ActorExt::ActorExt(ActorPtr actor, simgrid::s4u::Barrier* finalization_barrier)
+ActorExt::ActorExt(s4u::ActorPtr actor, s4u::Barrier* finalization_barrier)
: finalization_barrier_(finalization_barrier), actor_(actor)
{
- mailbox_ = simgrid::s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid()));
- mailbox_small_ = simgrid::s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid()));
- mailboxes_mutex_ = xbt_mutex_init();
+ 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()));
+ mailboxes_mutex_ = s4u::Mutex::create();
timer_ = xbt_os_timer_new();
state_ = SmpiProcessState::UNINITIALIZED;
if (MC_is_active())
if (comm_intra_ != MPI_COMM_NULL)
simgrid::smpi::Comm::destroy(comm_intra_);
xbt_os_timer_free(timer_);
- 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;
- argc_ = argc;
- argv_ = argv;
// 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 (state_ == SmpiProcessState::FINALIZED);
}
+/** @brief Check if a process is partially initialized already */
+int ActorExt::initializing()
+{
+ return (state_ == SmpiProcessState::INITIALIZING);
+}
+
/** @brief Check if a process is initialized */
int ActorExt::initialized()
{
return replaying_;
}
-ActorPtr ActorExt::get_actor()
+s4u::ActorPtr ActorExt::get_actor()
{
return actor_;
}
/**
- * \brief Returns a structure that stores the location (filename + linenumber) of the last calls to MPI_* functions.
+ * @brief Returns a structure that stores the location (filename + linenumber) of the last calls to MPI_* functions.
*
- * \see smpi_trace_set_call_location
+ * @see smpi_trace_set_call_location
*/
smpi_trace_call_location_t* ActorExt::call_location()
{
return comm_world_ == nullptr ? MPI_COMM_NULL : *comm_world_;
}
-smx_mailbox_t ActorExt::mailbox()
-{
- return mailbox_->get_impl();
-}
-
-smx_mailbox_t ActorExt::mailbox_small()
-{
- return mailbox_small_->get_impl();
-}
-
-xbt_mutex_t ActorExt::mailboxes_mutex()
+s4u::MutexPtr ActorExt::mailboxes_mutex()
{
return mailboxes_mutex_;
}
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);
-
- 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]);
- }
- // 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 (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();
+ // 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->set_data(argc, argv);
+ 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);
}
- 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.");
+
+ const char* instance_id = proc->get_property("instance_id");
+ const int rank = xbt_str_parse_int(proc->get_property("rank"), "Cannot parse rank");
+
+ process->state_ = SmpiProcessState::INITIALIZING;
+ smpi_deployment_register_process(instance_id, rank, proc);
+
+ process->set_data(instance_id);
}
int ActorExt::get_optind()
{
- return optind;
+ return optind_;
}
void ActorExt::set_optind(int new_optind)
{
- optind = new_optind;
+ optind_ = new_optind;
}
} // namespace smpi
