remove useless parameters in (simplified) instr

diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp
index 146d6b7..6d62b45 100644 (file)
--- a/src/instr/instr_smpi.hpp
+++ b/src/instr/instr_smpi.hpp
@@ -17,7 +17,7 @@ extern "C" {
 XBT_PRIVATE void TRACE_internal_smpi_set_category(const char* category);
 XBT_PRIVATE const char* TRACE_internal_smpi_get_category();
 XBT_PRIVATE void TRACE_smpi_collective_in(int rank, const char* operation, instr_extra_data extra);
-XBT_PRIVATE void TRACE_smpi_collective_out(int rank, const char* operation);
+XBT_PRIVATE void TRACE_smpi_collective_out(int rank);
 XBT_PRIVATE void TRACE_smpi_computing_init(int rank);
 XBT_PRIVATE void TRACE_smpi_computing_out(int rank);
 XBT_PRIVATE void TRACE_smpi_computing_in(int rank, instr_extra_data extra);
@@ -29,7 +29,7 @@ XBT_PRIVATE void TRACE_smpi_testing_in(int rank, instr_extra_data extra);
 XBT_PRIVATE void TRACE_smpi_alloc();
 XBT_PRIVATE void TRACE_smpi_release();
 XBT_PRIVATE void TRACE_smpi_ptp_in(int rank, const char* operation, instr_extra_data extra);
-XBT_PRIVATE void TRACE_smpi_ptp_out(int rank, int dst, const char* operation);
+XBT_PRIVATE void TRACE_smpi_ptp_out(int rank);
 XBT_PRIVATE void TRACE_smpi_send(int rank, int src, int dst, int tag, int size);
 XBT_PRIVATE void TRACE_smpi_recv(int src, int dst, int tag);
 XBT_PRIVATE void TRACE_smpi_init(int rank);

diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp
index da15d37..51cb592 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi.cpp
+++ b/src/smpi/bindings/smpi_pmpi.cpp
@@ -43,7 +43,7 @@ int PMPI_Init(int *argc, char ***argv)
     instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1);
     extra->type = TRACING_INIT;
     TRACE_smpi_collective_in(rank, __FUNCTION__, extra);
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
     smpi_bench_begin();
   }
 
@@ -62,7 +62,7 @@ int PMPI_Finalize()
 
   smpi_process()->finalize();
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   TRACE_smpi_finalize(smpi_process()->index());
   return MPI_SUCCESS;
 }

diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp
index b642343..978985c 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_coll.cpp
+++ b/src/smpi/bindings/smpi_pmpi_coll.cpp
@@ -44,7 +44,7 @@ int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm c
       simgrid::smpi::Colls::bcast(buf, count, datatype, root, comm);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -71,7 +71,7 @@ int PMPI_Barrier(MPI_Comm comm)
 
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -123,7 +123,7 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu
     simgrid::smpi::Colls::gather(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, root, comm);
 
     retval = MPI_SUCCESS;
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -180,7 +180,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv
     TRACE_smpi_collective_in(rank, __FUNCTION__, extra);
 
     retval = simgrid::smpi::Colls::gatherv(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcounts, displs, recvtype, root, comm);
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -227,7 +227,7 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
 
     simgrid::smpi::Colls::allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, comm);
     retval = MPI_SUCCESS;
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -279,7 +279,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype,
 
     simgrid::smpi::Colls::allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, recvtype, comm);
     retval = MPI_SUCCESS;
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -327,7 +327,7 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype,
 
     simgrid::smpi::Colls::scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, root, comm);
     retval = MPI_SUCCESS;
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -379,7 +379,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs,
 
     retval = simgrid::smpi::Colls::scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, recvtype, root, comm);
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -414,7 +414,7 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
     simgrid::smpi::Colls::reduce(sendbuf, recvbuf, count, datatype, op, root, comm);
 
     retval = MPI_SUCCESS;
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -472,7 +472,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp
       xbt_free(sendtmpbuf);
 
     retval = MPI_SUCCESS;
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -506,7 +506,7 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP
 
     retval = simgrid::smpi::Colls::scan(sendbuf, recvbuf, count, datatype, op, comm);
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
 
   smpi_bench_begin();
@@ -543,7 +543,7 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype,
 
     retval = simgrid::smpi::Colls::exscan(sendtmpbuf, recvbuf, count, datatype, op, comm);
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
     if (sendbuf == MPI_IN_PLACE)
       xbt_free(sendtmpbuf);
   }
@@ -594,7 +594,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat
 
     simgrid::smpi::Colls::reduce_scatter(sendtmpbuf, recvbuf, recvcounts, datatype, op, comm);
     retval = MPI_SUCCESS;
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
 
     if (sendbuf == MPI_IN_PLACE)
       xbt_free(sendtmpbuf);
@@ -649,7 +649,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount,
     xbt_free(recvcounts);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
 
     if (sendbuf == MPI_IN_PLACE)
       xbt_free(sendtmpbuf);
@@ -700,7 +700,7 @@ int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec
 
     retval = simgrid::smpi::Colls::alltoall(sendtmpbuf, sendtmpcount, sendtmptype, recvbuf, recvcount, recvtype, comm);
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
 
     if (sendbuf == MPI_IN_PLACE)
       xbt_free(sendtmpbuf);
@@ -771,7 +771,7 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype
     TRACE_smpi_collective_in(rank, __FUNCTION__, extra);
     retval = simgrid::smpi::Colls::alltoallv(sendtmpbuf, sendtmpcounts, sendtmpdisps, sendtmptype, recvbuf, recvcounts,
                                     recvdisps, recvtype, comm);
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
 
     if (sendbuf == MPI_IN_PLACE) {
       xbt_free(sendtmpbuf);

diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp
index 81dbe1b..aa9064e 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_request.cpp
+++ b/src/smpi/bindings/smpi_pmpi_request.cpp
@@ -175,7 +175,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP
     *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
 
   smpi_bench_begin();
@@ -224,7 +224,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP
     *request = simgrid::smpi::Request::isend(buf, count, datatype, dst, tag, comm);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
 
   smpi_bench_begin();
@@ -272,7 +272,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M
     *request = simgrid::smpi::Request::issend(buf, count, datatype, dst, tag, comm);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
 
   smpi_bench_begin();
@@ -325,7 +325,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI
         TRACE_smpi_recv(src_traced, rank, tag);
       }
     }
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
 
   smpi_bench_begin();
@@ -372,7 +372,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI
     simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
 
   smpi_bench_begin();
@@ -416,7 +416,7 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP
     simgrid::smpi::Request::ssend(buf, count, datatype, dst, tag, comm);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
 
   smpi_bench_begin();
@@ -474,7 +474,7 @@ int PMPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst,
                                      recvtag, comm, status);
     retval = MPI_SUCCESS;
 
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
     TRACE_smpi_recv(src_traced, rank, recvtag);
   }
 
@@ -628,7 +628,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status)
     retval = MPI_SUCCESS;
 
     //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
     if (is_wait_for_receive) {
       if(src_traced==MPI_ANY_SOURCE)
         src_traced = (status != MPI_STATUS_IGNORE) ? comm->group()->rank(status->MPI_SOURCE) : src_traced;
@@ -684,7 +684,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
                                                      : savedvals[*index].src;
       TRACE_smpi_recv(src_traced, dst_traced, savedvals[*index].tag);
     }
-    TRACE_smpi_ptp_out(rank_traced, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank_traced);
   }
   xbt_free(savedvals);
 
@@ -736,7 +736,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
       }
     }
   }
-  TRACE_smpi_ptp_out(rank_traced, -1, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank_traced);
   xbt_free(savedvals);
 
   smpi_bench_begin();

diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp
index 6c72e88..f7320c0 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_win.cpp
+++ b/src/smpi/bindings/smpi_pmpi_win.cpp
@@ -168,7 +168,7 @@ int PMPI_Win_fence( int assert,  MPI_Win win){
   int rank = smpi_process()->index();
   TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr);
   retval = win->fence(assert);
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -202,7 +202,7 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
     retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count,
                            target_datatype);
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -239,7 +239,7 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype
     retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count,
                            target_datatype, request);
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -275,7 +275,7 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype,
     retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count,
                            target_datatype);
 
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -314,7 +314,7 @@ int PMPI_Rput( void *origin_addr, int origin_count, MPI_Datatype origin_datatype
     retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count,
                            target_datatype, request);
 
-    TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -349,7 +349,7 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da
     retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count,
                                   target_datatype, op);
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -388,7 +388,7 @@ int PMPI_Raccumulate( void *origin_addr, int origin_count, MPI_Datatype origin_d
     retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count,
                                   target_datatype, op, request);
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -427,7 +427,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){
                                   result_count, result_datatype, target_rank, target_disp,
                                   target_count, target_datatype, op);
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -470,7 +470,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){
                                   result_count, result_datatype, target_rank, target_disp,
                                   target_count, target_datatype, op, request);
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -507,7 +507,7 @@ int PMPI_Compare_and_swap(void *origin_addr, void *compare_addr,
     retval = win->compare_and_swap( origin_addr, compare_addr, result_addr, datatype,
                                   target_rank, target_disp);
 
-    TRACE_smpi_ptp_out(rank, rank, __FUNCTION__);
+    TRACE_smpi_ptp_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -524,7 +524,7 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){
     int rank = smpi_process()->index();
     TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr);
     retval = win->post(group,assert);
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -541,7 +541,7 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){
     int rank = smpi_process()->index();
     TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr);
     retval = win->start(group,assert);
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -558,7 +558,7 @@ int PMPI_Win_complete(MPI_Win win){
 
     retval = win->complete();
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -575,7 +575,7 @@ int PMPI_Win_wait(MPI_Win win){
 
     retval = win->wait();
 
-    TRACE_smpi_collective_out(rank, __FUNCTION__);
+    TRACE_smpi_collective_out(rank);
   }
   smpi_bench_begin();
   return retval;
@@ -595,7 +595,7 @@ int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->lock(lock_type,rank,assert);
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;
@@ -612,7 +612,7 @@ int PMPI_Win_unlock(int rank, MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->unlock(rank);
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;
@@ -627,7 +627,7 @@ int PMPI_Win_lock_all(int assert, MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->lock_all(assert);
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;
@@ -642,7 +642,7 @@ int PMPI_Win_unlock_all(MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->unlock_all();
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;
@@ -659,7 +659,7 @@ int PMPI_Win_flush(int rank, MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->flush(rank);
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;
@@ -676,7 +676,7 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->flush_local(rank);
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;
@@ -691,7 +691,7 @@ int PMPI_Win_flush_all(MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->flush_all();
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;
@@ -706,7 +706,7 @@ int PMPI_Win_flush_local_all(MPI_Win win){
     int myrank = smpi_process()->index();
     TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr);
     retval = win->flush_local_all();
-    TRACE_smpi_collective_out(myrank, __FUNCTION__);
+    TRACE_smpi_collective_out(myrank);
   }
   smpi_bench_begin();
   return retval;

diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp
index f0b8b40..7583478 100644 (file)
--- a/src/smpi/internals/instr_smpi.cpp
+++ b/src/smpi/internals/instr_smpi.cpp
@@ -203,7 +203,7 @@ void TRACE_smpi_collective_in(int rank, const char *operation, instr_extra_data
   state->pushEvent(operation, static_cast<void*>(extra));
 }
 
-void TRACE_smpi_collective_out(int rank, const char *operation)
+void TRACE_smpi_collective_out(int rank)
 {
   if (TRACE_smpi_is_enabled())
     simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();
@@ -304,7 +304,7 @@ void TRACE_smpi_ptp_in(int rank, const char *operation, instr_extra_data extra)
   state->pushEvent(operation, static_cast<void*>(extra));
 }
 
-void TRACE_smpi_ptp_out(int rank, int dst, const char *operation)
+void TRACE_smpi_ptp_out(int rank)
 {
   if (TRACE_smpi_is_enabled())
     simgrid::instr::Container::byName(smpi_container(rank))->getState("MPI_STATE")->popEvent();

diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index 265b3be..7cba3e0 100644 (file)
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -243,7 +243,7 @@ static void action_send(const char *const *action)
 
   log_timed_action (action, clock);
 
-  TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
 }
 
 static void action_Isend(const char *const *action)
@@ -272,7 +272,7 @@ static void action_Isend(const char *const *action)
 
   MPI_Request request = Request::isend(nullptr, size, MPI_CURRENT_TYPE, to, 0,MPI_COMM_WORLD);
 
-  TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
 
   get_reqq_self()->push_back(request);
 
@@ -310,7 +310,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, rank, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
   if (not TRACE_smpi_view_internals()) {
     TRACE_smpi_recv(src_traced, rank, 0);
   }
@@ -348,7 +348,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, rank, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
   get_reqq_self()->push_back(request);
 
   log_timed_action (action, clock);
@@ -408,7 +408,7 @@ static void action_wait(const char *const *action){
 
   Request::wait(&request, &status);
 
-  TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__);
+  TRACE_smpi_ptp_out(rank);
   if (is_wait_for_receive)
     TRACE_smpi_recv(src_traced, dst_traced, 0);
   log_timed_action (action, clock);
@@ -443,7 +443,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, -1, __FUNCTION__);
+   TRACE_smpi_ptp_out(rank_traced);
   }
   log_timed_action (action, clock);
 }
@@ -457,7 +457,7 @@ static void action_barrier(const char *const *action){
 
   Colls::barrier(MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -489,7 +489,7 @@ static void action_bcast(const char *const *action)
 
   Colls::bcast(sendbuf, size, MPI_CURRENT_TYPE, root, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -524,7 +524,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_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -552,7 +552,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_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -586,7 +586,7 @@ static void action_allToAll(const char *const *action) {
 
   Colls::alltoall(send, send_size, MPI_CURRENT_TYPE, recv, recv_size, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -634,7 +634,7 @@ static void action_gather(const char *const *action) {
 
   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(), __FUNCTION__);
+  TRACE_smpi_collective_out(smpi_process()->index());
   log_timed_action (action, clock);
 }
 
@@ -692,7 +692,7 @@ static void action_gatherv(const char *const *action) {
 
   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(), __FUNCTION__);
+  TRACE_smpi_collective_out(smpi_process()->index());
   log_timed_action (action, clock);
 }
 
@@ -739,7 +739,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, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -781,7 +781,7 @@ static void action_allgather(const char *const *action) {
 
   Colls::allgather(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcount, MPI_CURRENT_TYPE2, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -834,7 +834,7 @@ static void action_allgatherv(const char *const *action) {
   Colls::allgatherv(sendbuf, sendcount, MPI_CURRENT_TYPE, recvbuf, recvcounts, disps, MPI_CURRENT_TYPE2,
                           MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -898,7 +898,7 @@ static void action_allToAllv(const char *const *action) {
   Colls::alltoallv(sendbuf, sendcounts, senddisps, MPI_CURRENT_TYPE,recvbuf, recvcounts, recvdisps,
                          MPI_CURRENT_TYPE, MPI_COMM_WORLD);
 
-  TRACE_smpi_collective_out(rank, __FUNCTION__);
+  TRACE_smpi_collective_out(rank);
   log_timed_action (action, clock);
 }
 
@@ -917,7 +917,7 @@ void smpi_replay_init(int* argc, char*** argv)
   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, "smpi_replay_run_init");
+  TRACE_smpi_collective_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);
@@ -991,7 +991,7 @@ void smpi_replay_main(int* argc, char*** argv)
 
   smpi_process()->finalize();
 
-  TRACE_smpi_collective_out(smpi_process()->index(), "smpi_replay_run_finalize");
+  TRACE_smpi_collective_out(smpi_process()->index());
   TRACE_smpi_finalize(smpi_process()->index());
 }