X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aedc7f54098826e18dc8c2bf32594e9baeb3832f..cadaf14d02d7d926cd339088dacff03077ba004f:/src/smpi/smpi_deployment.c

diff --git a/src/smpi/smpi_deployment.c b/src/smpi/smpi_deployment.c
index 42f679f482..30df611365 100644
--- a/src/smpi/smpi_deployment.c
+++ b/src/smpi/smpi_deployment.c
@@ -6,6 +6,7 @@
 
 #include "private.h"
 #include "xbt/sysdep.h"
+#include "xbt/synchro_core.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
 
@@ -19,6 +20,7 @@ typedef struct s_smpi_mpi_instance{
   int present_processes;
   int index;
   MPI_Comm comm_world;
+  xbt_bar_t finalization_barrier;
 } s_smpi_mpi_instance_t;
 
 
@@ -42,10 +44,12 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
   instance->present_processes = 0;
   instance->index = process_count;
   instance->comm_world = MPI_COMM_NULL;
+  instance->finalization_barrier=xbt_barrier_init(num_processes);
+
   process_count+=num_processes;
 
   if(!smpi_instances){
-      smpi_instances=xbt_dict_new_homogeneous(xbt_free);
+    smpi_instances = xbt_dict_new_homogeneous(xbt_free_f);
   }
 
   xbt_dict_set(smpi_instances, name, (void*)instance, NULL);
@@ -54,11 +58,13 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_
 
 
 //get the index of the process in the process_data array
-MPI_Comm* smpi_deployment_register_process(const char* instance_id, int rank, int index){
+void smpi_deployment_register_process(const char* instance_id, int rank, int index,MPI_Comm** comm, xbt_bar_t* bar){
 
   if(!smpi_instances){//no instance registered, we probably used smpirun.
-      index_to_process_data[index]=index;
-      return NULL;
+    index_to_process_data[index]=index;
+    *bar = NULL;
+    *comm = NULL;
+    return;
   }
 
   s_smpi_mpi_instance_t* instance = xbt_dict_get_or_null(smpi_instances, instance_id);
@@ -72,5 +78,20 @@ MPI_Comm* smpi_deployment_register_process(const char* instance_id, int rank, in
   instance->present_processes++;
   index_to_process_data[index]=instance->index+rank;
   smpi_group_set_mapping(smpi_comm_group(instance->comm_world), index, rank);
-  return & instance->comm_world;
+  *bar = instance->finalization_barrier;
+  *comm = &instance->comm_world;
+  return;
+}
+
+void smpi_deployment_cleanup_instances(){
+  xbt_dict_cursor_t cursor = NULL;
+  s_smpi_mpi_instance_t* instance = NULL;
+  char *name = NULL;
+  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);
+    xbt_barrier_destroy(instance->finalization_barrier);
+  }
+  xbt_dict_free(&smpi_instances);
 }