X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48eccb2c1532e35819830ca56fad7cf89887359f..ec1ff601331bbc2a69a3d7501f468e2238be2a5e:/src/smpi/smpi_rma.cpp

diff --git a/src/smpi/smpi_rma.cpp b/src/smpi/smpi_rma.cpp
index 98d3ae5aef..87c8a8a2ce 100644
--- a/src/smpi/smpi_rma.cpp
+++ b/src/smpi/smpi_rma.cpp
@@ -55,7 +55,6 @@ MPI_Win smpi_mpi_win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info
   if(rank==0){
     win->bar=xbt_barrier_init(comm_size);
   }
-
   mpi_coll_allgather_fun(&(win->connected_wins[rank]), sizeof(MPI_Win), MPI_BYTE, win->connected_wins, sizeof(MPI_Win),
                          MPI_BYTE, comm);
 
@@ -77,6 +76,11 @@ int smpi_mpi_win_free( MPI_Win* win){
   if((*win)->info!=MPI_INFO_NULL){
     MPI_Info_free(&(*win)->info);
   }
+
+  mpi_coll_barrier_fun((*win)->comm);
+  int rank=smpi_comm_rank((*win)->comm);
+  if(rank == 0)
+    xbt_barrier_destroy((*win)->bar);
   xbt_free(*win);
   *win = MPI_WIN_NULL;
   return MPI_SUCCESS;
@@ -95,7 +99,6 @@ void smpi_mpi_win_get_name(MPI_Win win, char* name, int* length){
 void smpi_mpi_win_get_group(MPI_Win win, MPI_Group* group){
   if(win->comm != MPI_COMM_NULL){
     *group = smpi_comm_group(win->comm);
-    smpi_group_use(*group);
   }
 }
 
@@ -355,6 +358,7 @@ int smpi_mpi_win_complete(MPI_Win win){
   win->requests=xbt_dynar_new(sizeof(MPI_Request), NULL);
   smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
   xbt_free(treqs);
+  smpi_group_unuse(win->group);
   win->opened--; //we're closed for business !
   return MPI_SUCCESS;
 }
@@ -404,6 +408,7 @@ int smpi_mpi_win_wait(MPI_Win win){
   win->requests=xbt_dynar_new(sizeof(MPI_Request), NULL);
   smpi_mpi_waitall(size,treqs,MPI_STATUSES_IGNORE);
   xbt_free(treqs);
+  smpi_group_unuse(win->group);
   win->opened--; //we're opened for business !
   return MPI_SUCCESS;
 }