a bit of unperfect simplification in this SMPI+TI TRacing mess

[simgrid.git] / src / smpi / bindings / smpi_pmpi_win.cpp

diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp
index 03b8438..4fa328d 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_win.cpp
+++ b/src/smpi/bindings/smpi_pmpi_win.cpp
@@ -3,9 +3,9 @@
 /* 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. */
 
-#include "private.h"
-#include "smpi_comm.hpp"
+#include "private.hpp"
 #include "smpi_coll.hpp"
+#include "smpi_comm.hpp"
 #include "smpi_datatype_derived.hpp"
 #include "smpi_op.hpp"
 #include "smpi_process.hpp"
@@ -77,7 +77,8 @@ int PMPI_Win_attach(MPI_Win win, void *base, MPI_Aint size){
   return retval;
 }
 
-int PMPI_Win_detach(MPI_Win win,  void *base){
+int PMPI_Win_detach(MPI_Win win, void* base)
+{
   int retval = 0;
   smpi_bench_end();
   if(win == MPI_WIN_NULL){
@@ -168,7 +169,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 +203,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 +240,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 +276,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 +315,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 +350,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 +389,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 +428,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 +471,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;
@@ -480,9 +481,9 @@ int PMPI_Fetch_and_op(void *origin_addr, void *result_addr, MPI_Datatype dtype,
   return PMPI_Get_accumulate(origin_addr, origin_addr==nullptr?0:1, dtype, result_addr, 1, dtype, target_rank, target_disp, 1, dtype, op, win);
 }
 
-int PMPI_Compare_and_swap(void *origin_addr, void *compare_addr,
-        void *result_addr, MPI_Datatype datatype, int target_rank,
-        MPI_Aint target_disp, MPI_Win win){
+int PMPI_Compare_and_swap(void* origin_addr, void* compare_addr, void* result_addr, MPI_Datatype datatype,
+                          int target_rank, MPI_Aint target_disp, MPI_Win win)
+{
   int retval = 0;
   smpi_bench_end();
   if (win == MPI_WIN_NULL) {
@@ -504,10 +505,9 @@ int PMPI_Compare_and_swap(void *origin_addr, void *compare_addr,
     win->get_group(&group);
     TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr);
 
-    retval = win->compare_and_swap( origin_addr, compare_addr, result_addr, datatype,
-                                  target_rank, target_disp);
+    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;