From ff7238f64c5f2c0c102c57844ff88fd52698497c Mon Sep 17 00:00:00 2001 From: Christian Heinrich Date: Wed, 17 Jan 2018 19:26:57 +0100 Subject: [PATCH] [SMPI] Rename variable 'rank' to 'my_proc_id' Because it's not the rank. --- src/smpi/bindings/smpi_pmpi_win.cpp | 136 ++++++++++++++-------------- 1 file changed, 68 insertions(+), 68 deletions(-) diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index 47bd49419e..aefdd1c646 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -166,10 +166,10 @@ int PMPI_Win_fence( int assert, MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_fence")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_fence")); retval = win->fence(assert); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -195,17 +195,17 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, ((not origin_datatype->is_valid()) || (not target_datatype->is_valid()))) { retval = MPI_ERR_TYPE; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Get", target_rank, + 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, target_datatype); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -234,17 +234,17 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Rget", target_rank, + 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); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -270,19 +270,19 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, ((not origin_datatype->is_valid()) || (not target_datatype->is_valid()))) { retval = MPI_ERR_TYPE; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); int dst_traced = group->actor(target_rank)->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Put", target_rank, + 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(rank, rank, 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); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -311,19 +311,19 @@ int PMPI_Rput( void *origin_addr, int origin_count, MPI_Datatype origin_datatype } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); int dst_traced = group->actor(target_rank)->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Rput", target_rank, + 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(rank, rank, 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, request); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -351,16 +351,16 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Accumulate", target_rank, + 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); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -391,17 +391,17 @@ int PMPI_Raccumulate( void *origin_addr, int origin_count, MPI_Datatype origin_d } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Raccumulate", target_rank, + 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); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -431,10 +431,10 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Get_accumulate", target_rank, + 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))); @@ -442,7 +442,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_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -476,10 +476,10 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::Pt2PtTIData("Rget_accumulate", target_rank, + 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))); @@ -487,7 +487,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_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -516,16 +516,16 @@ int PMPI_Compare_and_swap(void* origin_addr, void* compare_addr, void* result_ad } else if ((datatype == MPI_DATATYPE_NULL) || (not datatype->is_valid())) { retval = MPI_ERR_TYPE; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_comm_in(rank, __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))); retval = win->compare_and_swap(origin_addr, compare_addr, result_addr, datatype, target_rank, target_disp); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -539,10 +539,10 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_post")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_post")); retval = win->post(group,assert); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -556,10 +556,10 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_start")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_start")); retval = win->start(group,assert); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -571,12 +571,12 @@ int PMPI_Win_complete(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_complete")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_complete")); retval = win->complete(); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -588,12 +588,12 @@ int PMPI_Win_wait(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_wait")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_wait")); retval = win->wait(); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -610,10 +610,10 @@ int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __func__, new simgrid::instr::NoOpTIData("Win_lock")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_lock")); retval = win->lock(lock_type,rank,assert); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -627,10 +627,10 @@ int PMPI_Win_unlock(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_unlock")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_unlock")); retval = win->unlock(rank); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -642,10 +642,10 @@ int PMPI_Win_lock_all(int assert, MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_lock_all")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_lock_all")); retval = win->lock_all(assert); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -657,10 +657,10 @@ int PMPI_Win_unlock_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_unlock_all")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_unlock_all")); retval = win->unlock_all(); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -674,10 +674,10 @@ int PMPI_Win_flush(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush")); retval = win->flush(rank); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -691,10 +691,10 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush_local")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush_local")); retval = win->flush_local(rank); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -706,10 +706,10 @@ int PMPI_Win_flush_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush_all")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush_all")); retval = win->flush_all(); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -721,10 +721,10 @@ int PMPI_Win_flush_local_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(myrank, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush_local_all")); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("Win_flush_local_all")); retval = win->flush_local_all(); - TRACE_smpi_comm_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; -- 2.20.1