Have the communicators created together share a unique ID.

[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 f7eea95..379c77b 100644 (file)
--- a/src/smpi/internals/smpi_deployment.cpp
+++ b/src/smpi/internals/smpi_deployment.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2018. The SimGrid Team.
+/* Copyright (c) 2004-2019. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -16,8 +16,7 @@ namespace app {
 
 class Instance {
 public:
-  Instance(const std::string name, int max_no_processes, int process_count, MPI_Comm comm,
-           simgrid::s4u::Barrier* finalization_barrier)
+  Instance(const std::string& name, int max_no_processes, MPI_Comm comm, simgrid::s4u::Barrier* finalization_barrier)
       : name(name)
       , size(max_no_processes)
       , present_processes(0)
@@ -44,7 +43,10 @@ extern int process_count; // How many processes have been allocated over all ins
  * @brief Registers a running instance of a MPI program.
  *
  * @param name the reference name of the function.
- * @param code the main mpi function (must have a int ..(int argc, char *argv[])) prototype
+ * @param code either the main mpi function
+ *             (must have a int ..(int argc, char *argv[]) prototype) or nullptr
+ *             (if the function deployment is managed somewhere else —
+ *              e.g., when deploying manually or using smpirun)
  * @param num_processes the size of the instance we want to deploy
  */
 void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_processes)
@@ -62,10 +64,9 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
     }
   }
 
-  Instance instance(std::string(name), num_processes, process_count, MPI_COMM_NULL,
-                    new simgrid::s4u::Barrier(num_processes));
+  Instance instance(std::string(name), num_processes, MPI_COMM_NULL, new simgrid::s4u::Barrier(num_processes));
   MPI_Group group     = new simgrid::smpi::Group(instance.size);
-  instance.comm_world = new simgrid::smpi::Comm(group, nullptr);
+  instance.comm_world = new simgrid::smpi::Comm(group, nullptr, 0, -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));
@@ -75,7 +76,7 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
   smpi_instances.insert(std::pair<std::string, Instance>(name, instance));
 }
 
-void smpi_deployment_register_process(const std::string instance_id, int rank, simgrid::s4u::ActorPtr actor)
+void smpi_deployment_register_process(const std::string& instance_id, int rank, simgrid::s4u::ActorPtr actor)
 {
   Instance& instance = smpi_instances.at(instance_id);
 
@@ -83,7 +84,7 @@ void smpi_deployment_register_process(const std::string instance_id, int rank, s
   instance.comm_world->group()->set_mapping(actor, rank);
 }
 
-MPI_Comm* smpi_deployment_comm_world(const std::string instance_id)
+MPI_Comm* smpi_deployment_comm_world(const std::string& instance_id)
 {
   if (smpi_instances.empty()) { // no instance registered, we probably used smpirun.
     return nullptr;
@@ -92,7 +93,7 @@ MPI_Comm* smpi_deployment_comm_world(const std::string instance_id)
   return &instance.comm_world;
 }
 
-simgrid::s4u::Barrier* smpi_deployment_finalization_barrier(const std::string instance_id)
+simgrid::s4u::Barrier* smpi_deployment_finalization_barrier(const std::string& instance_id)
 {
   if (smpi_instances.empty()) { // no instance registered, we probably used smpirun.
     return nullptr;