X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bacd7bd4d7f71c81278597b83699d0b4185a56ed..068691c901bbd4875aebf81fa69c60ff6b0db623:/src/smpi/internals/smpi_deployment.cpp

diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp
index a11042e598..abc235f7a4 100644
--- a/src/smpi/internals/smpi_deployment.cpp
+++ b/src/smpi/internals/smpi_deployment.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2021. The SimGrid Team.
+/* Copyright (c) 2004-2022. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,37 +7,31 @@
 #include "smpi_host.hpp"
 #include "private.hpp"
 #include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Barrier.hpp"
 #include "smpi_comm.hpp"
 #include <map>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi);
 
-namespace simgrid {
-namespace smpi {
-namespace app {
+namespace simgrid::smpi::app {
 
 static int universe_size = 0;
 
 class Instance {
 public:
-  Instance(int max_no_processes) : size_(max_no_processes)
+  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);
-    //  FIXME : using MPI_Attr_put with MPI_UNIVERSE_SIZE is forbidden and we make it a no-op (which triggers a warning
-    //  as MPI_ERR_ARG is returned). Directly calling Comm::attr_put breaks for now, as MPI_UNIVERSE_SIZE,is <0
-    //  instance.comm_world->attr_put<simgrid::smpi::Comm>(MPI_UNIVERSE_SIZE, reinterpret_cast<void*>(instance.size));
-
     universe_size += max_no_processes;
+    bar_ = s4u::Barrier::create(size_);
   }
-
+  s4u::BarrierPtr bar_;
   unsigned int size_;
   unsigned int finalized_ranks_ = 0;
   MPI_Comm comm_world_;
 };
-}
-}
-}
+} // namespace simgrid::smpi::app
 
 using simgrid::smpi::app::Instance;
 
@@ -58,9 +52,7 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
   if (code != nullptr) // When started with smpirun, we will not execute a function
     simgrid::s4u::Engine::get_instance()->register_function(name, code);
 
-  Instance instance(num_processes);
-
-  smpi_instances.insert(std::pair<std::string, Instance>(name, instance));
+  smpi_instances.try_emplace(name, num_processes);
 }
 
 void smpi_deployment_register_process(const std::string& instance_id, int rank, const simgrid::s4u::Actor* actor)
@@ -69,6 +61,12 @@ void smpi_deployment_register_process(const std::string& instance_id, int rank,
   instance.comm_world_->group()->set_mapping(actor->get_pid(), rank);
 }
 
+void smpi_deployment_startup_barrier(const std::string& instance_id)
+{
+  const Instance& instance = smpi_instances.at(instance_id);
+  instance.bar_->wait();
+}
+
 void smpi_deployment_unregister_process(const std::string& instance_id)
 {
   Instance& instance = smpi_instances.at(instance_id);
@@ -91,9 +89,8 @@ MPI_Comm* smpi_deployment_comm_world(const std::string& instance_id)
 }
 
 void smpi_deployment_cleanup_instances(){
-  for (auto const& item : smpi_instances) {
-    XBT_INFO("Stalling SMPI instance: %s. Do all your MPI ranks call MPI_Finalize()?", item.first.c_str());
-    Instance instance = item.second;
+  for (auto const& [name, instance] : smpi_instances) {
+    XBT_INFO("Stalling SMPI instance: %s. Do all your MPI ranks call MPI_Finalize()?", name.c_str());
     simgrid::smpi::Comm::destroy(instance.comm_world_);
   }
   smpi_instances.clear();
@@ -141,20 +138,16 @@ static std::vector<std::string> smpi_read_replay(const std::string& replayfile)
 }
 
 /** @brief Build argument vector to pass to process */
-static std::vector<std::string> smpi_deployment_get_args(int rank_id, const std::vector<std::string>& replay, int argc,
-                                                         char* argv[])
+static std::vector<std::string> smpi_deployment_get_args(int rank_id, const std::vector<std::string>& replay,
+                                                         const std::vector<const char*>& run_args)
 {
   std::vector<std::string> args{std::to_string(rank_id)};
   // pass arguments to process only if not a replay execution
-  if (replay.empty()) {
-    for (int i = 0; i < argc; i++) {
-      args.emplace_back(argv[i]);
-    }
-  }
+  if (replay.empty())
+    args.insert(args.end(), begin(run_args), end(run_args));
   /* one trace per process */
-  if (replay.size() > 1) {
+  if (replay.size() > 1)
     args.emplace_back(replay[rank_id]);
-  }
   return args;
 }
 
@@ -165,7 +158,7 @@ static std::vector<std::string> smpi_deployment_get_args(int rank_id, const std:
  * If hostfile isn't provided, get the list of hosts from engine.
  */
 int smpi_deployment_smpirun(const simgrid::s4u::Engine* e, const std::string& hostfile, int np,
-                            const std::string& replayfile, int map, int argc, char* argv[])
+                            const std::string& replayfile, int map, const std::vector<const char*>& run_args)
 {
   auto hosts     = smpi_get_hosts(e, hostfile);
   auto replay    = smpi_read_replay(replayfile);
@@ -182,7 +175,7 @@ int smpi_deployment_smpirun(const simgrid::s4u::Engine* e, const std::string& ho
   for (int i = 0; i < np; i++) {
     simgrid::s4u::Host* host = hosts[i % hosts_size];
     std::string rank_id      = std::to_string(i);
-    auto args                = smpi_deployment_get_args(i, replay, argc, argv);
+    auto args                = smpi_deployment_get_args(i, replay, run_args);
     auto actor               = simgrid::s4u::Actor::create(rank_id, host, rank_id, args);
     /* keeping the same behavior as done in smpirun script, print mapping rank/process */
     if (map != 0) {