Change xbt_cfg_get_int -> simgrid::config::get_config<int>.

[simgrid.git] / src / smpi / mpi / smpi_win.cpp

diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp
index 7b3a4cc..39d4756 100644 (file)
--- a/src/smpi/mpi/smpi_win.cpp
+++ b/src/smpi/mpi/smpi_win.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -44,6 +44,7 @@ Win::Win(void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm,
   mode_=0;
 
   comm->add_rma_win(this);
+  comm->ref();
 
   Colls::allgather(&(connected_wins_[rank_]), sizeof(MPI_Win), MPI_BYTE, connected_wins_, sizeof(MPI_Win),
                          MPI_BYTE, comm);
@@ -72,6 +73,8 @@ Win::~Win(){
   comm_->remove_rma_win(this);
 
   Colls::barrier(comm_);
+  Comm::unref(comm_);
+  
   if (rank_ == 0)
     MSG_barrier_destroy(bar_);
   xbt_mutex_destroy(mut_);
@@ -635,9 +638,9 @@ int Win::unlock_all(){
 
 int Win::flush(int rank){
   MPI_Win target_win = connected_wins_[rank];
-  int finished = finish_comms(rank);
+  int finished       = finish_comms(rank_);
   XBT_DEBUG("Win_flush on local %d - Finished %d RMA calls", rank_, finished);
-  finished = target_win->finish_comms(rank_);
+  finished = target_win->finish_comms(rank);
   XBT_DEBUG("Win_flush on remote %d - Finished %d RMA calls", rank, finished);
   return MPI_SUCCESS;
 }
@@ -694,7 +697,7 @@ int Win::finish_comms(int rank){
     size = 0;
     std::vector<MPI_Request> myreqqs;
     std::vector<MPI_Request>::iterator iter = reqqs->begin();
-    int proc_id                             = comm_->group()->actor(rank)->getPid();
+    int proc_id                             = comm_->group()->actor(rank)->get_pid();
     while (iter != reqqs->end()){
       // Let's see if we're either the destination or the sender of this request
       // because we only wait for requests that we are responsible for.
@@ -719,5 +722,27 @@ int Win::finish_comms(int rank){
 }
 
 
+int Win::shared_query(int rank, MPI_Aint* size, int* disp_unit, void* baseptr){
+
+  if(rank!=MPI_PROC_NULL){
+    MPI_Win target_win = connected_wins_[rank];
+    *size=target_win->size_;
+    *disp_unit=target_win->disp_unit_;
+    *static_cast<void**>(baseptr)=target_win->base_;
+  }else{
+    for(int i=0; i<comm_->size();i++){
+      MPI_Win target_win = connected_wins_[i];
+      if(target_win->size_>0){
+        *size=target_win->size_;
+        *disp_unit=target_win->disp_unit_;
+        *static_cast<void**>(baseptr)=target_win->base_;
+        return MPI_SUCCESS;
+      }
+    }
+    *size=0;
+    *static_cast<void**>(baseptr)=xbt_malloc(0);
+  }
+  return MPI_SUCCESS;
+  }
 }
 }