From d5b7b6f105d774b359427f0202e0305a75d8d365 Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Wed, 17 Jan 2018 19:27:49 +0100 Subject: [PATCH] [SMPI] Cosmetics for smpi_pmpi_win.cpp as suggested by clang-format --- src/smpi/bindings/smpi_pmpi_win.cpp | 67 ++++++++++++++++++----------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index aefdd1c646..4bb15533bd 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -198,8 +198,10 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Get", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Get", target_rank, origin_datatype->is_replayable() + ? origin_count + : origin_count * origin_datatype->size(), encode_datatype(origin_datatype))); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, @@ -237,9 +239,11 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Rget", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), - encode_datatype(origin_datatype))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData( + "Rget", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + encode_datatype(origin_datatype))); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, request); @@ -274,10 +278,12 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, MPI_Group group; win->get_group(&group); int dst_traced = group->actor(target_rank)->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Put", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Put", target_rank, origin_datatype->is_replayable() + ? origin_count + : origin_count * origin_datatype->size(), encode_datatype(origin_datatype))); - TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count*origin_datatype->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count * origin_datatype->size()); retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype); @@ -315,10 +321,12 @@ int PMPI_Rput( void *origin_addr, int origin_count, MPI_Datatype origin_datatype MPI_Group group; win->get_group(&group); int dst_traced = group->actor(target_rank)->getPid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Rput", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), - encode_datatype(origin_datatype))); - TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count*origin_datatype->size()); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData( + "Rput", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + encode_datatype(origin_datatype))); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count * origin_datatype->size()); retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, request); @@ -354,9 +362,11 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Accumulate", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), - encode_datatype(origin_datatype))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData( + "Accumulate", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + encode_datatype(origin_datatype))); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op); @@ -394,9 +404,11 @@ int PMPI_Raccumulate( void *origin_addr, int origin_count, MPI_Datatype origin_d int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Raccumulate", target_rank, - origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), - encode_datatype(origin_datatype))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData( + "Raccumulate", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + encode_datatype(origin_datatype))); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, request); @@ -434,9 +446,11 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Get_accumulate", target_rank, - target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), - encode_datatype(target_datatype))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData( + "Get_accumulate", target_rank, + target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), + encode_datatype(target_datatype))); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, result_count, result_datatype, target_rank, target_disp, @@ -479,9 +493,11 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Rget_accumulate", target_rank, - target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), - encode_datatype(target_datatype))); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData( + "Rget_accumulate", target_rank, + target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), + encode_datatype(target_datatype))); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, result_count, result_datatype, target_rank, target_disp, @@ -519,7 +535,8 @@ int PMPI_Compare_and_swap(void* origin_addr, void* compare_addr, void* result_ad int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Compare_and_swap", target_rank, + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Compare_and_swap", target_rank, datatype->is_replayable() ? 1 : datatype->size(), encode_datatype(datatype))); -- 2.20.1