X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b62e431af6ffa480a59647aad94ffe0d292c05a8..8e426c4ae3d3b647a1610ecfd469e6e3c34f3f75:/src/smpi/smpi_deployment.cpp

diff --git a/src/smpi/smpi_deployment.cpp b/src/smpi/smpi_deployment.cpp
index 2747f0cb47..f6c169c70c 100644
--- a/src/smpi/smpi_deployment.cpp
+++ b/src/smpi/smpi_deployment.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -51,17 +51,14 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
   }
 
   xbt_dict_set(smpi_instances, name, (void*)instance, nullptr);
-  return;
 }
 
 //get the index of the process in the process_data array
-void smpi_deployment_register_process(const char* instance_id, int rank, int index, MPI_Comm** comm, msg_bar_t* bar)
+void smpi_deployment_register_process(const char* instance_id, int rank, int index)
 {
 
   if(smpi_instances==nullptr){//no instance registered, we probably used smpirun.
     index_to_process_data[index]=index;
-    *bar = nullptr;
-    *comm = nullptr;
     return;
   }
 
@@ -70,15 +67,35 @@ void smpi_deployment_register_process(const char* instance_id, int rank, int ind
   xbt_assert(instance, "Error, unknown instance %s", instance_id);
 
   if(instance->comm_world == MPI_COMM_NULL){
-    MPI_Group group = smpi_group_new(instance->size);
-    instance->comm_world = smpi_comm_new(group, nullptr);
+    MPI_Group group = new  simgrid::smpi::Group(instance->size);
+    instance->comm_world = new  simgrid::smpi::Comm(group, nullptr);
   }
   instance->present_processes++;
   index_to_process_data[index]=instance->index+rank;
-  smpi_group_set_mapping(smpi_comm_group(instance->comm_world), index, rank);
-  *bar = instance->finalization_barrier;
-  *comm = &instance->comm_world;
-  return;
+  instance->comm_world->group()->set_mapping(index, rank);
+}
+
+//get the index of the process in the process_data array
+MPI_Comm* smpi_deployment_comm_world(const char* instance_id)
+{
+  if(smpi_instances==nullptr){//no instance registered, we probably used smpirun.
+    return nullptr;
+  }
+  s_smpi_mpi_instance_t* instance =
+     static_cast<s_smpi_mpi_instance_t*>(xbt_dict_get_or_null(smpi_instances, instance_id));
+  xbt_assert(instance, "Error, unknown instance %s", instance_id);
+  return &instance->comm_world;
+}
+
+msg_bar_t smpi_deployment_finalization_barrier(const char* instance_id)
+{
+  if(smpi_instances==nullptr){//no instance registered, we probably used smpirun.
+    return nullptr;
+  }
+  s_smpi_mpi_instance_t* instance =
+     static_cast<s_smpi_mpi_instance_t*>(xbt_dict_get_or_null(smpi_instances, instance_id));
+  xbt_assert(instance, "Error, unknown instance %s", instance_id);
+  return instance->finalization_barrier;
 }
 
 void smpi_deployment_cleanup_instances(){
@@ -87,8 +104,8 @@ void smpi_deployment_cleanup_instances(){
   char *name = nullptr;
   xbt_dict_foreach(smpi_instances, cursor, name, instance) {
     if(instance->comm_world!=MPI_COMM_NULL)
-      while (smpi_group_unuse(smpi_comm_group(instance->comm_world)) > 0);
-    xbt_free(instance->comm_world);
+      delete instance->comm_world->group();
+    delete instance->comm_world;
     MSG_barrier_destroy(instance->finalization_barrier);
   }
   xbt_dict_free(&smpi_instances);