From c38add23758a684b2d0fba6d4a49d96b5f7b4a4b Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Wed, 31 Jul 2019 17:58:33 +0200
Subject: [PATCH] MPI init: inline a function

---
 src/smpi/include/smpi_actor.hpp   |  1 -
 src/smpi/internals/smpi_actor.cpp | 23 +++++++++--------------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/smpi/include/smpi_actor.hpp b/src/smpi/include/smpi_actor.hpp
index a0ee3b2307..049cf67628 100644
--- a/src/smpi/include/smpi_actor.hpp
+++ b/src/smpi/include/smpi_actor.hpp
@@ -49,7 +49,6 @@ public:
   ActorExt(const ActorExt&) = delete;
   ActorExt& operator=(const ActorExt&) = delete;
   ~ActorExt();
-  void set_data(const std::string& instance_id);
   void finalize();
   int finalized();
   int initializing();
diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp
index 3b91956a86..d4727a959f 100644
--- a/src/smpi/internals/smpi_actor.cpp
+++ b/src/smpi/internals/smpi_actor.cpp
@@ -58,19 +58,6 @@ ActorExt::~ActorExt()
   xbt_os_timer_free(timer_);
 }
 
-void ActorExt::set_data(const std::string& instance_id)
-{
-  instance_id_                   = 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;
-
-  // 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());
-}
-
 /** @brief Prepares the current process for termination. */
 void ActorExt::finalize()
 {
@@ -245,7 +232,15 @@ void ActorExt::init()
   ext->state_ = SmpiProcessState::INITIALIZING;
   smpi_deployment_register_process(instance_id, rank, self);
 
-  ext->set_data(instance_id);
+  ext->instance_id_              = instance_id;
+  ext->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
+    ext->finalization_barrier_ = barrier;
+
+  // set the process attached to the mailbox
+  ext->mailbox_small_->set_receiver(ext->actor_);
+  XBT_DEBUG("<%ld> SMPI process has been initialized: %p", ext->actor_->get_pid(), ext->actor_.get());
 }
 
 int ActorExt::get_optind()
-- 
2.20.1