X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fc5d774ff8e253d3127812d681e7d08b489fc4a..2d37e348a09783cda723c7019640ee69de168324:/src/smpi/internals/smpi_deployment.cpp

diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp
index ccf7148c0e..441d608072 100644
--- 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)
@@ -40,17 +39,20 @@ using simgrid::smpi::app::Instance;
 static std::map<std::string, Instance> smpi_instances;
 extern int process_count; // How many processes have been allocated over all instances?
 
-/** \ingroup smpi_simulation
- * \brief Registers a running instance of a MPI program.
+/** @ingroup smpi_simulation
+ * @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 num_processes the size of the instance we want to deploy
+ * @param name the reference name of the function.
+ * @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)
 {
   if (code != nullptr) { // When started with smpirun, we will not execute a function
-    SIMIX_function_register(name, code);
+    simgrid::s4u::Engine::get_instance()->register_function(name, code);
   }
 
   static int already_called = 0;
@@ -62,11 +64,12 @@ 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);
-  MPI_Attr_put(instance.comm_world, MPI_UNIVERSE_SIZE, reinterpret_cast<void*>(instance.size));
+//  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));
 
   process_count+=num_processes;