[SMPI] Rename variables from 'rank' to 'my_proc_id' in smpi_replay.cpp

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index 0897ed1..bfd780e 100644 (file)
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -200,11 +200,11 @@ static void action_compute(const char *const *action)
   CHECK_ACTION_PARAMS(action, 1, 0)
   double clock = smpi_process()->simulated_elapsed();
   double flops= parse_double(action[2]);
-  int rank = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
 
-  TRACE_smpi_computing_in(rank, flops);
+  TRACE_smpi_computing_in(my_proc_id, flops);
   smpi_execute_flops(flops);
-  TRACE_smpi_computing_out(rank);
+  TRACE_smpi_computing_out(my_proc_id);
 
   log_timed_action (action, clock);
 }
@@ -221,17 +221,17 @@ static void action_send(const char *const *action)
   else
     MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
 
-  int rank = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
   int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid();
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__,
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::Pt2PtTIData("send", to, size, encode_datatype(MPI_CURRENT_TYPE)));
   if (not TRACE_smpi_view_internals())
-    TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
+    TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
 
   Request::send(nullptr, size, MPI_CURRENT_TYPE, to , 0, MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
 
   log_timed_action(action, clock);
 }
@@ -248,16 +248,16 @@ static void action_Isend(const char *const *action)
   else
     MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
 
-  int rank = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
   int dst_traced = MPI_COMM_WORLD->group()->actor(to)->getPid();
-  TRACE_smpi_comm_in(rank, __FUNCTION__,
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::Pt2PtTIData("Isend", to, size, encode_datatype(MPI_CURRENT_TYPE)));
   if (not TRACE_smpi_view_internals())
-    TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
+    TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
 
   MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0, MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
 
   get_reqq_self()->push_back(request);
 
@@ -276,10 +276,10 @@ static void action_recv(const char *const *action) {
   else
     MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
 
-  int rank = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
   int src_traced = MPI_COMM_WORLD->group()->actor(from)->getPid();
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__,
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::Pt2PtTIData("recv", from, size, encode_datatype(MPI_CURRENT_TYPE)));
 
   //unknown size from the receiver point of view
@@ -290,9 +290,9 @@ static void action_recv(const char *const *action) {
 
   Request::recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   if (not TRACE_smpi_view_internals()) {
-    TRACE_smpi_recv(src_traced, rank, 0);
+    TRACE_smpi_recv(src_traced, my_proc_id, 0);
   }
 
   log_timed_action (action, clock);
@@ -310,8 +310,8 @@ static void action_Irecv(const char *const *action)
   else
     MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
 
-  int rank = Actor::self()->getPid();
-  TRACE_smpi_comm_in(rank, __FUNCTION__,
+  int my_proc_id = Actor::self()->getPid();
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::Pt2PtTIData("Irecv", from, size, encode_datatype(MPI_CURRENT_TYPE)));
   MPI_Status status;
   //unknow size from the receiver pov
@@ -322,7 +322,7 @@ static void action_Irecv(const char *const *action)
 
   MPI_Request request = Request::irecv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   get_reqq_self()->push_back(request);
 
   log_timed_action (action, clock);
@@ -340,8 +340,8 @@ static void action_test(const char* const* action)
   //Different times in traced application and replayed version may lead to this
   //In this case, ignore the extra calls.
   if(request!=nullptr){
-    int rank = Actor::self()->getPid();
-    TRACE_smpi_testing_in(rank);
+    int my_proc_id = Actor::self()->getPid();
+    TRACE_smpi_testing_in(my_proc_id);
 
     int flag = Request::test(&request, &status);
 
@@ -349,7 +349,7 @@ static void action_test(const char* const* action)
     /* push back request in vector to be caught by a subsequent wait. if the test did succeed, the request is now nullptr.*/
     get_reqq_self()->push_back(request);
 
-    TRACE_smpi_testing_out(rank);
+    TRACE_smpi_testing_out(my_proc_id);
   }
   log_timed_action (action, clock);
 }
@@ -393,8 +393,8 @@ static void action_waitall(const char *const *action){
   if (count_requests>0) {
     MPI_Status status[count_requests];
 
-   int rank_traced = Actor::self()->getPid();
-   TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
+   int my_proc_id_traced = Actor::self()->getPid();
+   TRACE_smpi_comm_in(my_proc_id_traced, __FUNCTION__, new simgrid::instr::Pt2PtTIData("waitAll", -1, count_requests, ""));
    int recvs_snd[count_requests];
    int recvs_rcv[count_requests];
    for (unsigned int i = 0; i < count_requests; i++) {
@@ -411,19 +411,19 @@ static void action_waitall(const char *const *action){
      if (recvs_snd[i]!=-100)
        TRACE_smpi_recv(recvs_snd[i], recvs_rcv[i],0);
    }
-   TRACE_smpi_comm_out(rank_traced);
+   TRACE_smpi_comm_out(my_proc_id_traced);
   }
   log_timed_action (action, clock);
 }
 
 static void action_barrier(const char *const *action){
   double clock = smpi_process()->simulated_elapsed();
-  int rank = Actor::self()->getPid();
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier"));
+  int my_proc_id = Actor::self()->getPid();
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("barrier"));
 
   Colls::barrier(MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -442,8 +442,8 @@ static void action_bcast(const char *const *action)
       MPI_CURRENT_TYPE=decode_datatype(action[4]);
   }
 
-  int rank = Actor::self()->getPid();
-  TRACE_smpi_comm_in(rank, __FUNCTION__,
+  int my_proc_id = Actor::self()->getPid();
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::CollTIData("bcast", MPI_COMM_WORLD->group()->actor(root)->getPid(), -1.0, size, -1,
                                                     encode_datatype(MPI_CURRENT_TYPE), ""));
 
@@ -451,7 +451,7 @@ static void action_bcast(const char *const *action)
 
   Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -470,8 +470,8 @@ static void action_reduce(const char *const *action)
       MPI_CURRENT_TYPE=decode_datatype(action[5]);
   }
 
-  int rank = Actor::self()->getPid();
-  TRACE_smpi_comm_in(rank, __FUNCTION__,
+  int my_proc_id = Actor::self()->getPid();
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::CollTIData("reduce", MPI_COMM_WORLD->group()->actor(root)->getPid(), comp_size,
                                                     comm_size, -1, encode_datatype(MPI_CURRENT_TYPE), ""));
 
@@ -480,7 +480,7 @@ static void action_reduce(const char *const *action)
   Colls::reduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -495,8 +495,8 @@ static void action_allReduce(const char *const *action) {
     MPI_CURRENT_TYPE= MPI_DEFAULT_TYPE;
 
   double clock = smpi_process()->simulated_elapsed();
-  int rank = Actor::self()->getPid();
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("allReduce", -1, comp_size, comm_size, -1,
+  int my_proc_id = Actor::self()->getPid();
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allReduce", -1, comp_size, comm_size, -1,
                                                                         encode_datatype(MPI_CURRENT_TYPE), ""));
 
   void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
@@ -504,7 +504,7 @@ static void action_allReduce(const char *const *action) {
   Colls::allreduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -526,14 +526,14 @@ static void action_allToAll(const char *const *action) {
   void *send = smpi_get_tmp_sendbuffer(send_size*comm_size* MPI_CURRENT_TYPE->size());
   void *recv = smpi_get_tmp_recvbuffer(recv_size*comm_size* MPI_CURRENT_TYPE2->size());
 
-  int rank = Actor::self()->getPid();
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("allToAll", -1, -1.0, send_size, recv_size,
+  int my_proc_id = Actor::self()->getPid();
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allToAll", -1, -1.0, send_size, recv_size,
                                                                         encode_datatype(MPI_CURRENT_TYPE),
                                                                         encode_datatype(MPI_CURRENT_TYPE2)));
 
   Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -742,7 +742,7 @@ static void action_reducescatter(const char *const *action) {
   CHECK_ACTION_PARAMS(action, comm_size+1, 1)
   int comp_size = parse_double(action[2+comm_size]);
   int recvcounts[comm_size];
-  int rank = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
   int size = 0;
   std::vector<int>* trace_recvcounts = new std::vector<int>;
   if(action[3+comm_size])
@@ -756,7 +756,7 @@ static void action_reducescatter(const char *const *action) {
     size+=recvcounts[i];
   }
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__,
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__,
                      new simgrid::instr::VarCollTIData("reduceScatter", -1, 0, nullptr, -1, trace_recvcounts,
                                                        std::to_string(comp_size), /* ugly hack to print comp_size */
                                                        encode_datatype(MPI_CURRENT_TYPE)));
@@ -767,7 +767,7 @@ static void action_reducescatter(const char *const *action) {
   Colls::reduce_scatter(sendbuf, recvbuf, recvcounts, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -796,15 +796,15 @@ static void action_allgather(const char *const *action) {
   void *sendbuf = smpi_get_tmp_sendbuffer(sendcount* MPI_CURRENT_TYPE->size());
   void *recvbuf = smpi_get_tmp_recvbuffer(recvcount* MPI_CURRENT_TYPE2->size());
 
-  int rank = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount,
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::CollTIData("allGather", -1, -1.0, sendcount, recvcount,
                                                                         encode_datatype(MPI_CURRENT_TYPE),
                                                                         encode_datatype(MPI_CURRENT_TYPE2)));
 
   Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -841,20 +841,20 @@ static void action_allgatherv(const char *const *action) {
   }
   void *recvbuf = smpi_get_tmp_recvbuffer(recv_sum* MPI_CURRENT_TYPE2->size());
 
-  int rank = Actor::self()->getPid();
+  int my_proc_id = Actor::self()->getPid();
 
   std::vector<int>* trace_recvcounts = new std::vector<int>;
   for (int i = 0; i < comm_size; i++) // copy data to avoid bad free
     trace_recvcounts->push_back(recvcounts[i]);
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData(
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData(
                                              "allGatherV", -1, sendcount, nullptr, -1, trace_recvcounts,
                                              encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2)));
 
   Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2,
                           MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -891,7 +891,7 @@ static void action_allToAllv(const char *const *action) {
   else
     MPI_CURRENT_TYPE=MPI_DEFAULT_TYPE;
 
-  int rank       = Actor::self()->getPid();
+  int my_proc_id       = Actor::self()->getPid();
   void *sendbuf = smpi_get_tmp_sendbuffer(send_buf_size* MPI_CURRENT_TYPE->size());
   void *recvbuf  = smpi_get_tmp_recvbuffer(recv_buf_size* MPI_CURRENT_TYPE2->size());
 
@@ -906,14 +906,14 @@ static void action_allToAllv(const char *const *action) {
     recvdisps[i] = 0;
   }
 
-  TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData(
+  TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::VarCollTIData(
                                              "allToAllV", -1, send_size, trace_sendcounts, recv_size, trace_recvcounts,
                                              encode_datatype(MPI_CURRENT_TYPE), encode_datatype(MPI_CURRENT_TYPE2)));
 
   Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps,
                          MPI_CURRENT_TYPE, MPI_COMM_WORLD);
 
-  TRACE_smpi_comm_out(rank);
+  TRACE_smpi_comm_out(my_proc_id);
   log_timed_action (action, clock);
 }
 
@@ -926,11 +926,11 @@ void smpi_replay_init(int* argc, char*** argv)
   smpi_process()->mark_as_initialized();
   smpi_process()->set_replaying(true);
 
-  int rank = Actor::self()->getPid();
-  TRACE_smpi_init(rank);
-  TRACE_smpi_computing_init(rank);
-  TRACE_smpi_comm_in(rank, "smpi_replay_run_init", new simgrid::instr::NoOpTIData("init"));
-  TRACE_smpi_comm_out(rank);
+  int my_proc_id = Actor::self()->getPid();
+  TRACE_smpi_init(my_proc_id);
+  TRACE_smpi_computing_init(my_proc_id);
+  TRACE_smpi_comm_in(my_proc_id, "smpi_replay_run_init", new simgrid::instr::NoOpTIData("init"));
+  TRACE_smpi_comm_out(my_proc_id);
   xbt_replay_action_register("init",       simgrid::smpi::action_init);
   xbt_replay_action_register("finalize",   simgrid::smpi::action_finalize);
   xbt_replay_action_register("comm_size",  simgrid::smpi::action_comm_size);