Refactorize the sthread interception of functions

[simgrid.git] / src / smpi / internals / smpi_deployment.cpp

diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp
index d20de25f5d2b0d5add70d73427749657b1d16012..9c9d7c8bdf424982553c3eeba1ad626bce120db1 100644 (file)
--- a/src/smpi/internals/smpi_deployment.cpp
+++ b/src/smpi/internals/smpi_deployment.cpp
@@ -15,15 +15,12 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi);
 
 namespace simgrid::smpi::app {
 
-static int universe_size = 0;
-
 class Instance {
 public:
   explicit Instance(int max_no_processes) : size_(max_no_processes)
   {
     auto* group = new simgrid::smpi::Group(size_);
     comm_world_ = new simgrid::smpi::Comm(group, nullptr, false, -1);
-    universe_size += max_no_processes;
     bar_ = s4u::Barrier::create(size_);
   }
   s4u::BarrierPtr bar_;
@@ -57,21 +54,35 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
 void SMPI_app_instance_start(const char* name, const std::function<void()>& code,
                              std::vector<simgrid::s4u::Host*> const& hosts)
 {
-  xbt_assert(hosts.size(), "Cannot start a SMPI instance on 0 hosts");
-  smpi_instances.try_emplace(name, hosts.size());
+  xbt_assert(not hosts.empty(), "Cannot start a SMPI instance on 0 hosts");
+
+  auto [_, inserted] = smpi_instances.try_emplace(name, hosts.size());
+  xbt_assert(inserted, "Cannot start two MPI applications of the same name '%s'", name);
 
   int rank = 0;
   for (auto* host : hosts) {
-    auto rank_str          = std::to_string(rank);
-    std::string actor_name = std::string(name) + "#" + rank_str;
-    auto actor             = simgrid::s4u::Actor::create(actor_name, host, code);
+    auto rank_str = std::to_string(rank);
+    auto actor    = simgrid::s4u::Actor::init(std::string(name) + "#" + rank_str, host);
     actor->set_property("instance_id", name);
     actor->set_property("rank", rank_str);
+    actor->start(code);
+
     smpi_deployment_register_process(name, rank, actor.get());
 
     rank++;
   }
 }
+void SMPI_app_instance_join(const std::string& instance_id)
+{
+  std::vector<simgrid::s4u::ActorPtr> actors =
+      simgrid::s4u::Engine::get_instance()->get_filtered_actors([instance_id](simgrid::s4u::ActorPtr act) {
+        auto* actor_instance = act->get_property("instance_id");
+        return actor_instance != nullptr && strcmp(actor_instance, instance_id.c_str()) == 0;
+      });
+
+  for (auto& act : actors)
+    act->join();
+}
 
 void smpi_deployment_register_process(const std::string& instance_id, int rank, const simgrid::s4u::Actor* actor)
 {
@@ -110,11 +121,6 @@ void smpi_deployment_cleanup_instances(){
   smpi_instances.clear();
 }
 
-int smpi_get_universe_size()
-{
-  return simgrid::smpi::app::universe_size;
-}
-
 /** @brief Auxiliary method to get list of hosts to deploy app */
 static std::vector<simgrid::s4u::Host*> smpi_get_hosts(const simgrid::s4u::Engine* e, const std::string& hostfile)
 {