[SMPI] Remove index() from smpi_win.cpp + cosmetics

[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 7cc829a..58c9b96 100644 (file)
--- a/src/smpi/mpi/smpi_win.cpp
+++ b/src/smpi/mpi/smpi_win.cpp
@@ -70,8 +70,7 @@ Win::~Win(){
   comm_->remove_rma_win(this);
 
   Colls::barrier(comm_);
-  int rank=comm_->rank();
-  if(rank == 0)
+  if (rank_ == 0)
     MSG_barrier_destroy(bar_);
   xbt_mutex_destroy(mut_);
   xbt_mutex_destroy(lock_mut_);
@@ -208,14 +207,16 @@ int Win::put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
   void* recv_addr = static_cast<void*> ( static_cast<char*>(recv_win->base_) + target_disp * recv_win->disp_unit_);
   XBT_DEBUG("Entering MPI_Put to %d", target_rank);
 
-  if(target_rank != comm_->rank()){
+  if (target_rank != comm_->rank()) {
     //prepare send_request
-    MPI_Request sreq = Request::rma_send_init(origin_addr, origin_count, origin_datatype, smpi_process()->index(),
-        comm_->group()->index(target_rank), SMPI_RMA_TAG+1, comm_, MPI_OP_NULL);
+    MPI_Request sreq =
+        Request::rma_send_init(origin_addr, origin_count, origin_datatype, comm_->rank(),
+                               comm_->group()->actor(target_rank)->getPid() - 1, SMPI_RMA_TAG + 1, comm_, MPI_OP_NULL);
 
     //prepare receiver request
-    MPI_Request rreq = Request::rma_recv_init(recv_addr, target_count, target_datatype, smpi_process()->index(),
-        comm_->group()->index(target_rank), SMPI_RMA_TAG+1, recv_win->comm_, MPI_OP_NULL);
+    MPI_Request rreq = Request::rma_recv_init(recv_addr, target_count, target_datatype, comm_->rank(),
+                                              comm_->group()->actor(target_rank)->getPid() - 1, SMPI_RMA_TAG + 1,
+                                              recv_win->comm_, MPI_OP_NULL);
 
     //start send
     sreq->start();
@@ -268,13 +269,13 @@ int Win::get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
   if(target_rank != comm_->rank()){
     //prepare send_request
     MPI_Request sreq = Request::rma_send_init(send_addr, target_count, target_datatype,
-        comm_->group()->index(target_rank), smpi_process()->index(), SMPI_RMA_TAG+2, send_win->comm_,
-        MPI_OP_NULL);
+                                              comm_->group()->actor(target_rank)->getPid() - 1, comm_->rank(),
+                                              SMPI_RMA_TAG + 2, send_win->comm_, MPI_OP_NULL);
 
     //prepare receiver request
     MPI_Request rreq = Request::rma_recv_init(origin_addr, origin_count, origin_datatype,
-        comm_->group()->index(target_rank), smpi_process()->index(), SMPI_RMA_TAG+2, comm_,
-        MPI_OP_NULL);
+                                              comm_->group()->actor(target_rank)->getPid() - 1, comm_->rank(),
+                                              SMPI_RMA_TAG + 2, comm_, MPI_OP_NULL);
 
     //start the send, with another process than us as sender.
     sreq->start();
@@ -307,7 +308,7 @@ int Win::get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
 int Win::accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank,
               MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Request* request)
 {
-
+  XBT_DEBUG("Entering MPI_Win_Accumulate");
   //get receiver pointer
   MPI_Win recv_win = connected_wins_[target_rank];
 
@@ -330,31 +331,34 @@ int Win::accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da
     //As the tag will be used for ordering of the operations, substract count from it (to avoid collisions with other SMPI tags, SMPI_RMA_TAG is set below all the other ones we use )
     //prepare send_request
 
-    MPI_Request sreq = Request::rma_send_init(origin_addr, origin_count, origin_datatype,
-        smpi_process()->index(), comm_->group()->index(target_rank), SMPI_RMA_TAG-3-count_, comm_, op);
+  MPI_Request sreq =
+      Request::rma_send_init(origin_addr, origin_count, origin_datatype, comm_->rank(),
+                             comm_->group()->actor(target_rank)->getPid() - 1, SMPI_RMA_TAG - 3 - count_, comm_, op);
 
-    //prepare receiver request
-    MPI_Request rreq = Request::rma_recv_init(recv_addr, target_count, target_datatype,
-        smpi_process()->index(), comm_->group()->index(target_rank), SMPI_RMA_TAG-3-count_, recv_win->comm_, op);
+  // prepare receiver request
+  MPI_Request rreq = Request::rma_recv_init(recv_addr, target_count, target_datatype, comm_->rank(),
+                                            comm_->group()->actor(target_rank)->getPid() - 1, SMPI_RMA_TAG - 3 - count_,
+                                            recv_win->comm_, op);
 
-    count_++;
+  count_++;
 
-    //start send
-    sreq->start();
-    //push request to receiver's win
-    xbt_mutex_acquire(recv_win->mut_);
-    recv_win->requests_->push_back(rreq);
-    rreq->start();
-    xbt_mutex_release(recv_win->mut_);
+  // start send
+  sreq->start();
+  // push request to receiver's win
+  xbt_mutex_acquire(recv_win->mut_);
+  recv_win->requests_->push_back(rreq);
+  rreq->start();
+  xbt_mutex_release(recv_win->mut_);
 
-    if(request!=nullptr){
-      *request=sreq;
+  if (request != nullptr) {
+    *request = sreq;
     }else{
       xbt_mutex_acquire(mut_);
       requests_->push_back(sreq);
       xbt_mutex_release(mut_);
     }
 
+  XBT_DEBUG("Leaving MPI_Win_Accumulate");
   return MPI_SUCCESS;
 }
 
@@ -446,9 +450,10 @@ int Win::start(MPI_Group group, int assert){
     int size          = group->size();
     MPI_Request* reqs = xbt_new0(MPI_Request, size);
 
+  XBT_DEBUG("Entering MPI_Win_Start");
     while (j != size) {
-      int src = group->index(j);
-      if (src != smpi_process()->index() && src != MPI_UNDEFINED) {
+      int src = group->actor(j)->getPid()-1;
+      if (src != comm_->rank() && src != MPI_UNDEFINED) {
         reqs[i] = Request::irecv_init(nullptr, 0, MPI_CHAR, src, SMPI_RMA_TAG + 4, MPI_COMM_WORLD);
         i++;
       }
@@ -464,6 +469,7 @@ int Win::start(MPI_Group group, int assert){
   opened_++; //we're open for business !
   group_=group;
   group->ref();
+  XBT_DEBUG("Leaving MPI_Win_Start");
   return MPI_SUCCESS;
 }
 
@@ -474,9 +480,10 @@ int Win::post(MPI_Group group, int assert){
   int size = group->size();
   MPI_Request* reqs = xbt_new0(MPI_Request, size);
 
+  XBT_DEBUG("Entering MPI_Win_Post");
   while(j!=size){
-    int dst=group->index(j);
-    if(dst!=smpi_process()->index() && dst!=MPI_UNDEFINED){
+    int dst=group->actor(j)->getPid()-1;
+    if (dst != comm_->rank() && dst != MPI_UNDEFINED) {
       reqs[i]=Request::send_init(nullptr, 0, MPI_CHAR, dst, SMPI_RMA_TAG+4, MPI_COMM_WORLD);
       i++;
     }
@@ -493,6 +500,7 @@ int Win::post(MPI_Group group, int assert){
   opened_++; //we're open for business !
   group_=group;
   group->ref();
+  XBT_DEBUG("Leaving MPI_Win_Post");
   return MPI_SUCCESS;
 }
 
@@ -507,8 +515,8 @@ int Win::complete(){
   MPI_Request* reqs = xbt_new0(MPI_Request, size);
 
   while(j!=size){
-    int dst=group_->index(j);
-    if(dst!=smpi_process()->index() && dst!=MPI_UNDEFINED){
+    int dst=group_->actor(j)->getPid()-1;
+    if (dst != comm_->rank() && dst != MPI_UNDEFINED) {
       reqs[i]=Request::send_init(nullptr, 0, MPI_CHAR, dst, SMPI_RMA_TAG+5, MPI_COMM_WORLD);
       i++;
     }
@@ -541,8 +549,8 @@ int Win::wait(){
   MPI_Request* reqs = xbt_new0(MPI_Request, size);
 
   while(j!=size){
-    int src=group_->index(j);
-    if(src!=smpi_process()->index() && src!=MPI_UNDEFINED){
+    int src=group_->actor(j)->getPid()-1;
+    if (src != comm_->rank() && src != MPI_UNDEFINED) {
       reqs[i]=Request::irecv_init(nullptr, 0, MPI_CHAR, src,SMPI_RMA_TAG+5, MPI_COMM_WORLD);
       i++;
     }