X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d51848cefcf39dbe0072eacd5fc50765b8b4e37..9fd6cbc6c3b06f4b09e3c3339ffb3cc8a68f9bfa:/src/smpi/internals/smpi_actor.cpp

diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp
index 2b88022816..c358275cd4 100644
--- a/src/smpi/internals/smpi_actor.cpp
+++ b/src/smpi/internals/smpi_actor.cpp
@@ -7,7 +7,6 @@
 #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
@@ -70,16 +69,12 @@ void ActorExt::set_data(int* argc, char*** argv)
   if (barrier != nullptr) // don't overwrite the current one if the instance has none
     finalization_barrier_ = barrier;
 
-  static_cast<simgrid::msg::ActorExt*>(actor_->get_impl()->get_user_data())->data = this;
-
   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());
@@ -104,6 +99,12 @@ int ActorExt::finalized()
   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()
 {
@@ -130,25 +131,15 @@ bool ActorExt::replaying()
   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()
 {
@@ -251,8 +242,16 @@ void ActorExt::init(int* argc, char*** argv)
   }
   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]));
@@ -261,9 +260,6 @@ void ActorExt::init(int* argc, char*** argv)
       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());
@@ -272,10 +268,7 @@ void ActorExt::init(int* argc, char*** argv)
     }
 
     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()