X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/33a2dd5a405effecfbc7a26d7a84664902a2432a..5f5a10db6fc4552782638abb4817041223e17775:/src/smpi/internals/smpi_actor.cpp

diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp
index ad8af7dc62..056cecf48e 100644
--- a/src/smpi/internals/smpi_actor.cpp
+++ b/src/smpi/internals/smpi_actor.cpp
@@ -1,24 +1,24 @@
-/* Copyright (c) 2009-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2023. 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. */
 
 #include "src/smpi/include/smpi_actor.hpp"
-#include "mc/mc.h"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Mutex.hpp"
 #include "smpi_comm.hpp"
 #include "smpi_info.hpp"
+#include "src/mc/mc.h"
 #include "src/mc/mc_replay.hpp"
+#include "xbt/str.h"
 
 #if HAVE_PAPI
-#include "papi.h"
+#include <papi.h>
 #endif
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)");
 
-namespace simgrid {
-namespace smpi {
+namespace simgrid::smpi {
 simgrid::xbt::Extension<simgrid::s4u::Actor, ActorExt> ActorExt::EXTENSION_ID;
 
 ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor)
@@ -26,14 +26,12 @@ ActorExt::ActorExt(s4u::Actor* actor) : actor_(actor)
   if (not simgrid::smpi::ActorExt::EXTENSION_ID.valid())
     simgrid::smpi::ActorExt::EXTENSION_ID = simgrid::s4u::Actor::extension_create<simgrid::smpi::ActorExt>();
 
-  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()));
+  mailbox_         = nullptr;
+  mailbox_small_   = nullptr;
   mailboxes_mutex_ = s4u::Mutex::create();
   timer_           = xbt_os_timer_new();
   state_           = SmpiProcessState::UNINITIALIZED;
   info_env_        = MPI_INFO_NULL;
-  if (MC_is_active())
-    MC_ignore_heap(timer_, xbt_os_timer_size());
 
 #if HAVE_PAPI
   if (not smpi_cfg_papi_events_file().empty()) {
@@ -92,6 +90,22 @@ int ActorExt::initialized() const
   return (state_ == SmpiProcessState::INITIALIZED);
 }
 
+/** @brief Return main mailbox of the process */
+s4u::Mailbox* ActorExt::mailbox()
+{
+  if(mailbox_==nullptr)
+    mailbox_=s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid()));
+  return mailbox_;
+}
+
+/** @brief Return mailbox for small messages */
+s4u::Mailbox* ActorExt::mailbox_small()
+{
+  if(mailbox_small_==nullptr)
+    mailbox_small_=s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid()));
+  return mailbox_small_;
+}
+
 /** @brief Mark a process as initialized (=MPI_Init called) */
 void ActorExt::mark_as_initialized()
 {
@@ -225,16 +239,16 @@ int ActorExt::sampling() const
 
 void ActorExt::init()
 {
-  xbt_assert(smpi_get_universe_size() != 0, "SimGrid was not initialized properly before entering MPI_Init. "
-                                            "Aborting, please check compilation process and use smpirun.");
-
   ActorExt* ext = smpi_process();
   // if we are in MPI_Init and argc handling has already been done.
   if (ext->initialized())
     return;
 
   const simgrid::s4u::Actor* self = simgrid::s4u::Actor::self();
-  ext->instance_id_ = self->get_property("instance_id");
+  const char* id                  = self->get_property("instance_id");
+  xbt_assert(id != nullptr, "Actor '%s' seem to be calling MPI_Init(), but it was created outside of MPI, wasn't it?",
+             self->get_cname());
+  ext->instance_id_ = id;
   const int rank = static_cast<int>(xbt_str_parse_int(self->get_property("rank"), "Cannot parse rank"));
 
   ext->state_ = SmpiProcessState::INITIALIZING;
@@ -243,7 +257,7 @@ void ActorExt::init()
   ext->comm_world_ = smpi_deployment_comm_world(ext->instance_id_);
 
   // set the process attached to the mailbox
-  ext->mailbox_small_->set_receiver(ext->actor_);
+  ext->mailbox_small()->set_receiver(ext->actor_);
   XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_);
 }
 
@@ -272,5 +286,4 @@ int ActorExt::set_bsend_buffer(void* buf, int size)
   return MPI_SUCCESS;
 }
 
-} // namespace smpi
-} // namespace simgrid
+} // namespace simgrid::smpi