#include "mc/mc.h"
#include "smpi_comm.hpp"
#include "src/mc/mc_replay.hpp"
-#include "src/msg/msg_private.hpp"
#include "src/simix/smx_private.hpp"
#if HAVE_PAPI
(*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_;
}
-void ActorExt::set_user_data(void* data)
-{
- data_ = data;
-}
-
-void* ActorExt::get_user_data()
-{
- return data_;
-}
-
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()
{
}
if (argc != nullptr && argv != nullptr) {
simgrid::s4u::ActorPtr proc = simgrid::s4u::Actor::self();
- proc->get_impl()->context_->set_cleanup(&MSG_process_cleanup_from_SIMIX);
-
+ 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]));
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());
}
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. "
- "Please use MPI_Init(&argc, &argv) as usual instead.");
+ }
}
int ActorExt::get_optind()