merge identical functions

[simgrid.git] / src / smpi / internals / smpi_replay.cpp

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index d4102d2..6377489 100644 (file)
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -229,7 +229,7 @@ static void action_send(const char *const *action)
   extra->src = rank;
   extra->dst = dst_traced;
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
-  TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
   if (not TRACE_smpi_view_internals())
     TRACE_smpi_send(rank, rank, dst_traced, 0, size*MPI_CURRENT_TYPE->size());
 
@@ -237,7 +237,7 @@ static void action_send(const char *const *action)
 
   log_timed_action (action, clock);
 
-  TRACE_smpi_ptp_out(rank);
+  TRACE_smpi_comm_out(rank);
 }
 
 static void action_Isend(const char *const *action)
@@ -260,13 +260,13 @@ static void action_Isend(const char *const *action)
   extra->src = rank;
   extra->dst = dst_traced;
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
-  TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
   if (not TRACE_smpi_view_internals())
     TRACE_smpi_send(rank, rank, 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_ptp_out(rank);
+  TRACE_smpi_comm_out(rank);
 
   get_reqq_self()->push_back(request);
 
@@ -294,7 +294,7 @@ static void action_recv(const char *const *action) {
   extra->src = src_traced;
   extra->dst = rank;
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
-  TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   //unknown size from the receiver point of view
   if(size<=0.0){
@@ -304,7 +304,7 @@ static void action_recv(const char *const *action) {
 
   Request::recv(nullptr, size, MPI_CURRENT_TYPE, from, 0, MPI_COMM_WORLD, &status);
 
-  TRACE_smpi_ptp_out(rank);
+  TRACE_smpi_comm_out(rank);
   if (not TRACE_smpi_view_internals()) {
     TRACE_smpi_recv(src_traced, rank, 0);
   }
@@ -332,7 +332,7 @@ static void action_Irecv(const char *const *action)
   extra->src = src_traced;
   extra->dst = rank;
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
-  TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
   MPI_Status status;
   //unknow size from the receiver pov
   if(size<=0.0){
@@ -342,7 +342,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_ptp_out(rank);
+  TRACE_smpi_comm_out(rank);
   get_reqq_self()->push_back(request);
 
   log_timed_action (action, clock);
@@ -398,11 +398,11 @@ static void action_wait(const char *const *action){
   int is_wait_for_receive = (request->flags() & RECV);
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
   extra->type = TRACING_WAIT;
-  TRACE_smpi_ptp_in(rank, __FUNCTION__, extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   Request::wait(&request, &status);
 
-  TRACE_smpi_ptp_out(rank);
+  TRACE_smpi_comm_out(rank);
   if (is_wait_for_receive)
     TRACE_smpi_recv(src_traced, dst_traced, 0);
   log_timed_action (action, clock);
@@ -420,7 +420,7 @@ static void action_waitall(const char *const *action){
    instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
    extra->type = TRACING_WAITALL;
    extra->send_size=count_requests;
-   TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra);
+   TRACE_smpi_comm_in(rank_traced, __FUNCTION__, extra);
    int recvs_snd[count_requests];
    int recvs_rcv[count_requests];
    for (unsigned int i = 0; i < count_requests; i++) {
@@ -437,7 +437,7 @@ 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_ptp_out(rank_traced);
+   TRACE_smpi_comm_out(rank_traced);
   }
   log_timed_action (action, clock);
 }
@@ -447,11 +447,11 @@ static void action_barrier(const char *const *action){
   int rank = smpi_process()->index();
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
   extra->type = TRACING_BARRIER;
-  TRACE_smpi_collective_in(rank, __FUNCTION__, extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   Colls::barrier(MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -478,12 +478,12 @@ static void action_bcast(const char *const *action)
   extra->send_size = size;
   extra->root = root_traced;
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
-  TRACE_smpi_collective_in(rank, __FUNCTION__, extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
   void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size());
 
   Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -511,14 +511,14 @@ static void action_reduce(const char *const *action)
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   extra->root = root_traced;
 
-  TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
   void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
   Colls::reduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, root, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -539,14 +539,14 @@ static void action_allReduce(const char *const *action) {
   extra->send_size = comm_size;
   extra->comp_size = comp_size;
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
-  TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   void *recvbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
   void *sendbuf = smpi_get_tmp_sendbuffer(comm_size* MPI_CURRENT_TYPE->size());
   Colls::allreduce(sendbuf, recvbuf, comm_size, MPI_CURRENT_TYPE, MPI_OP_NULL, MPI_COMM_WORLD);
   smpi_execute_flops(comp_size);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -576,11 +576,11 @@ static void action_allToAll(const char *const *action) {
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
 
-  TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -624,11 +624,11 @@ static void action_gather(const char *const *action) {
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
 
-  TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra);
+  TRACE_smpi_comm_in(smpi_process()->index(), __FUNCTION__, extra);
 
   Colls::gather(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(smpi_process()->index());
+  TRACE_smpi_comm_out(smpi_process()->index());
   log_timed_action (action, clock);
 }
 
@@ -682,11 +682,11 @@ static void action_gatherv(const char *const *action) {
   extra->datatype1       = encode_datatype(MPI_CURRENT_TYPE);
   extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
 
-  TRACE_smpi_collective_in(smpi_process()->index(), __FUNCTION__, extra);
+  TRACE_smpi_comm_in(smpi_process()->index(), __FUNCTION__, extra);
 
   Colls::gatherv(send, send_size, MPI_CURRENT_TYPE, recv, recvcounts, disps, MPI_CURRENT_TYPE2, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(smpi_process()->index());
+  TRACE_smpi_comm_out(smpi_process()->index());
   log_timed_action (action, clock);
 }
 
@@ -725,7 +725,7 @@ static void action_reducescatter(const char *const *action) {
   extra->comp_size = comp_size;
   extra->num_processes = comm_size;
 
-  TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   void *sendbuf = smpi_get_tmp_sendbuffer(size* MPI_CURRENT_TYPE->size());
   void *recvbuf = smpi_get_tmp_recvbuffer(size* MPI_CURRENT_TYPE->size());
@@ -733,7 +733,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_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -771,11 +771,11 @@ static void action_allgather(const char *const *action) {
   extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
   extra->num_processes = MPI_COMM_WORLD->size();
 
-  TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -823,12 +823,12 @@ static void action_allgatherv(const char *const *action) {
   extra->datatype2       = encode_datatype(MPI_CURRENT_TYPE2);
   extra->num_processes = comm_size;
 
-  TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2,
                           MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -887,12 +887,12 @@ static void action_allToAllv(const char *const *action) {
   extra->datatype1 = encode_datatype(MPI_CURRENT_TYPE);
   extra->datatype2 = encode_datatype(MPI_CURRENT_TYPE2);
 
-  TRACE_smpi_collective_in(rank, __FUNCTION__,extra);
+  TRACE_smpi_comm_in(rank, __FUNCTION__, extra);
 
   Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps,
                          MPI_CURRENT_TYPE, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -910,8 +910,8 @@ void smpi_replay_init(int* argc, char*** argv)
   TRACE_smpi_computing_init(rank);
   instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
   extra->type = TRACING_INIT;
-  TRACE_smpi_collective_in(rank, "smpi_replay_run_init", extra);
-  TRACE_smpi_collective_out(rank);
+  TRACE_smpi_comm_in(rank, "smpi_replay_run_init", extra);
+  TRACE_smpi_comm_out(rank);
   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);
@@ -981,11 +981,11 @@ void smpi_replay_main(int* argc, char*** argv)
 
   instr_extra_data extra_fin = xbt_new0(s_instr_extra_data_t,1);
   extra_fin->type = TRACING_FINALIZE;
-  TRACE_smpi_collective_in(smpi_process()->index(), "smpi_replay_run_finalize", extra_fin);
+  TRACE_smpi_comm_in(smpi_process()->index(), "smpi_replay_run_finalize", extra_fin);
 
   smpi_process()->finalize();
 
-  TRACE_smpi_collective_out(smpi_process()->index());
+  TRACE_smpi_comm_out(smpi_process()->index());
   TRACE_smpi_finalize(smpi_process()->index());
 }