Merge branch 'master' of https://github.com/Onesphore/simgrid into Onesphore-master

[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 a3dbcef..6c1c75c 100644 (file)
--- a/src/smpi/internals/smpi_deployment.cpp
+++ b/src/smpi/internals/smpi_deployment.cpp
@@ -4,7 +4,7 @@
 /* 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 "SmpiHost.hpp"
+#include "smpi_host.hpp"
 #include "private.hpp"
 #include "simgrid/msg.h" /* barrier */
 #include "simgrid/s4u/Engine.hpp"
@@ -44,7 +44,6 @@ extern int process_count; // How many processes have been allocated over all ins
 /** \ingroup smpi_simulation
  * \brief Registers a running instance of a MPI program.
  *
- * FIXME : remove MSG from the loop at some point.
  * \param name the reference name of the function.
  * \param code the main mpi function (must have a int ..(int argc, char *argv[])) prototype
  * \param num_processes the size of the instance we want to deploy
@@ -58,9 +57,9 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
   static int already_called = 0;
   if (not already_called) {
     already_called = 1;
-    std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::getInstance()->get_all_hosts();
+    std::vector<simgrid::s4u::Host*> list = simgrid::s4u::Engine::get_instance()->get_all_hosts();
     for (auto const& host : list) {
-      host->extension_set(new simgrid::smpi::SmpiHost(host));
+      host->extension_set(new simgrid::smpi::Host(host));
     }
   }
 
@@ -76,9 +75,6 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
 
 void smpi_deployment_register_process(const std::string instance_id, int rank, simgrid::s4u::ActorPtr actor)
 {
-  if (smpi_instances.empty()) // no instance registered, we probably used smpirun.
-    return;
-
   Instance& instance = smpi_instances.at(instance_id);
 
   instance.present_processes++;