From a50f1c6823777ad314408ffe052174f74453b1b0 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 28 Mar 2018 22:39:44 +0200 Subject: [PATCH] prefer this_actor:: to Actor::self()-> --- include/smpi/smpi.h | 2 +- src/smpi/bindings/smpi_pmpi.cpp | 9 +++-- src/smpi/bindings/smpi_pmpi_coll.cpp | 32 ++++++++-------- src/smpi/bindings/smpi_pmpi_comm.cpp | 2 +- src/smpi/bindings/smpi_pmpi_group.cpp | 2 +- src/smpi/bindings/smpi_pmpi_request.cpp | 22 +++++------ src/smpi/bindings/smpi_pmpi_win.cpp | 44 +++++++++++----------- src/smpi/colls/smpi_automatic_selector.cpp | 2 +- src/smpi/internals/smpi_bench.cpp | 6 +-- src/smpi/internals/smpi_global.cpp | 2 +- src/smpi/internals/smpi_replay.cpp | 15 ++++---- src/smpi/mpi/smpi_f2c.cpp | 2 +- src/smpi/mpi/smpi_request.cpp | 30 +++++++-------- 13 files changed, 86 insertions(+), 84 deletions(-) diff --git a/include/smpi/smpi.h b/include/smpi/smpi.h index 0f28c90ac7..34b5e547eb 100644 --- a/include/smpi/smpi.h +++ b/include/smpi/smpi.h @@ -977,7 +977,7 @@ XBT_PUBLIC void* smpi_shared_set_call(const char* func, const char* input, void* /* Fortran specific stuff */ XBT_PUBLIC int smpi_main(const char* program, int argc, char* argv[]); -XBT_ATTRIB_DEPRECATED_v322("Use Actor::self()->getPid(): v3.22 will turn this warning into an error.") XBT_PUBLIC +XBT_ATTRIB_DEPRECATED_v322("Use s4u::this_actor::getPid(): v3.22 will turn this warning into an error.") XBT_PUBLIC int smpi_process_index(); XBT_PUBLIC void smpi_process_init(int* argc, char*** argv); diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 3a85c23419..aa14f3b0a7 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -36,7 +36,7 @@ int PMPI_Init(int *argc, char ***argv) if(already_init == 0){ simgrid::smpi::Process::init(argc, argv); smpi_process()->mark_as_initialized(); - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_init(rank); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("init")); TRACE_smpi_comm_out(rank); @@ -52,7 +52,7 @@ int PMPI_Init(int *argc, char ***argv) int PMPI_Finalize() { smpi_bench_end(); - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); @@ -108,8 +108,9 @@ int PMPI_Is_thread_main(int *flag) if (flag == nullptr) { return MPI_ERR_ARG; } else { - *flag = simgrid::s4u::Actor::self()->getPid() == 1; // FIXME: I don't think this is correct: This just returns true if the process ID is 1, - // regardless of whether this process called MPI_Thread_Init() or not. + *flag = simgrid::s4u::this_actor::getPid() == + 1; // FIXME: I don't think this is correct: This just returns true if the process ID is 1, + // regardless of whether this process called MPI_Thread_Init() or not. return MPI_SUCCESS; } } diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index b97688f4af..9b9fa96dfe 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -25,7 +25,7 @@ int PMPI_Bcast(void *buf, int count, MPI_Datatype datatype, int root, MPI_Comm c } else if (not datatype->is_valid()) { retval = MPI_ERR_ARG; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::CollTIData("bcast", root, -1.0, datatype->is_replayable() ? count : count * datatype->size(), -1, @@ -49,7 +49,7 @@ int PMPI_Barrier(MPI_Comm comm) if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::NoOpTIData("barrier")); simgrid::smpi::Colls::barrier(comm); @@ -89,7 +89,7 @@ int PMPI_Gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,void *recvbu sendtmpcount=0; sendtmptype=recvtype; } - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in( rank, __func__, @@ -133,7 +133,7 @@ int PMPI_Gatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recv sendtmptype=recvtype; } - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); int dt_size_recv = recvtype->is_replayable() ? 1 : recvtype->size(); std::vector* trace_recvcounts = new std::vector; @@ -178,7 +178,7 @@ int PMPI_Allgather(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount=recvcount; sendtype=recvtype; } - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::CollTIData( @@ -215,7 +215,7 @@ int PMPI_Allgatherv(void *sendbuf, int sendcount, MPI_Datatype sendtype, sendcount=recvcounts[comm->rank()]; sendtype=recvtype; } - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); int dt_size_recv = recvtype->is_replayable() ? 1 : recvtype->size(); std::vector* trace_recvcounts = new std::vector; @@ -258,7 +258,7 @@ int PMPI_Scatter(void *sendbuf, int sendcount, MPI_Datatype sendtype, recvtype = sendtype; recvcount = sendcount; } - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in( rank, __func__, @@ -296,7 +296,7 @@ int PMPI_Scatterv(void *sendbuf, int *sendcounts, int *displs, recvtype = sendtype; recvcount = sendcounts[comm->rank()]; } - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); int dt_size_send = sendtype->is_replayable() ? 1 : sendtype->size(); std::vector* trace_sendcounts = new std::vector; @@ -331,7 +331,7 @@ int PMPI_Reduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, } else if (not datatype->is_valid() || op == MPI_OP_NULL) { retval = MPI_ERR_ARG; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::CollTIData("reduce", root, 0, @@ -381,7 +381,7 @@ int PMPI_Allreduce(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatyp sendtmpbuf = static_cast(xbt_malloc(count*datatype->get_extent())); simgrid::smpi::Datatype::copy(recvbuf, count, datatype,sendtmpbuf, count, datatype); } - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::CollTIData("allReduce", -1, 0, @@ -414,7 +414,7 @@ int PMPI_Scan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MP } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(rank, __func__, new simgrid::instr::Pt2PtTIData( "scan", -1, datatype->is_replayable() ? count : count * datatype->size(), @@ -441,7 +441,7 @@ int PMPI_Exscan(void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); void* sendtmpbuf = sendbuf; if (sendbuf == MPI_IN_PLACE) { sendtmpbuf = static_cast(xbt_malloc(count * datatype->size())); @@ -477,7 +477,7 @@ int PMPI_Reduce_scatter(void *sendbuf, void *recvbuf, int *recvcounts, MPI_Datat } else if (recvcounts == nullptr) { retval = MPI_ERR_ARG; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); std::vector* trace_recvcounts = new std::vector; int dt_send_size = datatype->is_replayable() ? 1 : datatype->size(); int totalcount = 0; @@ -526,7 +526,7 @@ int PMPI_Reduce_scatter_block(void *sendbuf, void *recvbuf, int recvcount, } else { int count = comm->size(); - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); int dt_send_size = datatype->is_replayable() ? 1 : datatype->size(); std::vector* trace_recvcounts = new std::vector(recvcount * dt_send_size); // copy data to avoid bad free @@ -568,7 +568,7 @@ int PMPI_Alltoall(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* rec } else if ((sendbuf != MPI_IN_PLACE && sendtype == MPI_DATATYPE_NULL) || recvtype == MPI_DATATYPE_NULL) { retval = MPI_ERR_TYPE; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); void* sendtmpbuf = static_cast(sendbuf); int sendtmpcount = sendcount; MPI_Datatype sendtmptype = sendtype; @@ -613,7 +613,7 @@ int PMPI_Alltoallv(void* sendbuf, int* sendcounts, int* senddisps, MPI_Datatype recvdisps == nullptr) { retval = MPI_ERR_ARG; } else { - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); int size = comm->size(); int send_size = 0; int recv_size = 0; diff --git a/src/smpi/bindings/smpi_pmpi_comm.cpp b/src/smpi/bindings/smpi_pmpi_comm.cpp index f0f2ed449a..85d57caf22 100644 --- a/src/smpi/bindings/smpi_pmpi_comm.cpp +++ b/src/smpi/bindings/smpi_pmpi_comm.cpp @@ -101,7 +101,7 @@ int PMPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm * newcomm) return MPI_ERR_GROUP; } else if (newcomm == nullptr) { return MPI_ERR_ARG; - } else if(group->rank(simgrid::s4u::Actor::self()->getPid())==MPI_UNDEFINED){ + } else if (group->rank(simgrid::s4u::this_actor::getPid()) == MPI_UNDEFINED) { *newcomm= MPI_COMM_NULL; return MPI_SUCCESS; }else{ diff --git a/src/smpi/bindings/smpi_pmpi_group.cpp b/src/smpi/bindings/smpi_pmpi_group.cpp index 8d0bee588c..6ada95691f 100644 --- a/src/smpi/bindings/smpi_pmpi_group.cpp +++ b/src/smpi/bindings/smpi_pmpi_group.cpp @@ -46,7 +46,7 @@ int PMPI_Group_rank(MPI_Group group, int *rank) } else if (rank == nullptr) { return MPI_ERR_ARG; } else { - *rank = group->rank(simgrid::s4u::Actor::self()->getPid()); + *rank = group->rank(simgrid::s4u::this_actor::getPid()); return MPI_SUCCESS; } } diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index 6ec5f7a322..ec183c4549 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -163,7 +163,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Irecv", src, @@ -204,7 +204,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); int trace_dst = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Isend", dst, @@ -246,7 +246,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); int trace_dst = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("ISsend", dst, @@ -286,7 +286,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("recv", src, datatype->is_replayable() ? count : count * datatype->size(), @@ -328,7 +328,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI } else if(tag < 0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); int dst_traced = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("send", dst, @@ -366,7 +366,7 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP } else if(tag<0 && tag != MPI_ANY_TAG){ retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); int dst_traced = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Ssend", dst, @@ -415,7 +415,7 @@ int PMPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, } else if((sendtag<0 && sendtag != MPI_ANY_TAG)||(recvtag<0 && recvtag != MPI_ANY_TAG)){ retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); int dst_traced = getPid(comm, dst); int src_traced = getPid(comm, src); @@ -476,7 +476,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) simgrid::smpi::Status::empty(status); retval = MPI_SUCCESS; } else { - int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::Actor::self()->getPid() : -1; + int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::getPid() : -1; TRACE_smpi_testing_in(my_proc_id); @@ -591,7 +591,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) retval = MPI_SUCCESS; } else { int my_proc_id = (*request)->comm() != MPI_COMM_NULL - ? simgrid::s4u::Actor::self()->getPid() + ? simgrid::s4u::this_actor::getPid() : -1; // TODO: cheinrich: Check if this correct or if it should be MPI_UNDEFINED TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("wait")); @@ -618,7 +618,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta smpi_bench_end(); - int rank_traced = simgrid::s4u::Actor::self()->getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? + int rank_traced = simgrid::s4u::this_actor::getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitAny", static_cast(count))); *index = simgrid::smpi::Request::waitany(count, requests, status); @@ -636,7 +636,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { smpi_bench_end(); - int rank_traced = simgrid::s4u::Actor::self()->getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? + int rank_traced = simgrid::s4u::this_actor::getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitAll", static_cast(count))); int retval = simgrid::smpi::Request::waitall(count, requests, status); diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index 13f510d7f6..0447347469 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -165,7 +165,7 @@ int PMPI_Win_fence( int assert, MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_fence")); retval = win->fence(assert); TRACE_smpi_comm_out(my_proc_id); @@ -194,7 +194,7 @@ 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 my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -235,7 +235,7 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -273,7 +273,7 @@ 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 my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); int dst_traced = group->actor(target_rank)->getPid(); @@ -316,7 +316,7 @@ int PMPI_Rput( void *origin_addr, int origin_count, MPI_Datatype origin_datatype } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); int dst_traced = group->actor(target_rank)->getPid(); @@ -358,7 +358,7 @@ 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 my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -400,7 +400,7 @@ int PMPI_Raccumulate( void *origin_addr, int origin_count, MPI_Datatype origin_d } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -442,7 +442,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -489,7 +489,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -531,7 +531,7 @@ 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 my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -555,7 +555,7 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_post")); retval = win->post(group,assert); TRACE_smpi_comm_out(my_proc_id); @@ -572,7 +572,7 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_start")); retval = win->start(group,assert); TRACE_smpi_comm_out(my_proc_id); @@ -587,7 +587,7 @@ int PMPI_Win_complete(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_complete")); retval = win->complete(); @@ -604,7 +604,7 @@ int PMPI_Win_wait(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_wait")); retval = win->wait(); @@ -626,7 +626,7 @@ 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 my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::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(my_proc_id); @@ -643,7 +643,7 @@ int PMPI_Win_unlock(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_unlock")); retval = win->unlock(rank); TRACE_smpi_comm_out(my_proc_id); @@ -658,7 +658,7 @@ int PMPI_Win_lock_all(int assert, MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_lock_all")); retval = win->lock_all(assert); TRACE_smpi_comm_out(my_proc_id); @@ -673,7 +673,7 @@ int PMPI_Win_unlock_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_unlock_all")); retval = win->unlock_all(); TRACE_smpi_comm_out(my_proc_id); @@ -690,7 +690,7 @@ int PMPI_Win_flush(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush")); retval = win->flush(rank); TRACE_smpi_comm_out(my_proc_id); @@ -707,7 +707,7 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_local")); retval = win->flush_local(rank); TRACE_smpi_comm_out(my_proc_id); @@ -722,7 +722,7 @@ int PMPI_Win_flush_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_all")); retval = win->flush_all(); TRACE_smpi_comm_out(my_proc_id); @@ -737,7 +737,7 @@ int PMPI_Win_flush_local_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_local_all")); retval = win->flush_local_all(); TRACE_smpi_comm_out(my_proc_id); diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp index 23b2a933b9..95ead049e6 100644 --- a/src/smpi/colls/smpi_automatic_selector.cpp +++ b/src/smpi/colls/smpi_automatic_selector.cpp @@ -15,7 +15,7 @@ if (TRACE_is_enabled()) { \ simgrid::instr::EventType* type = simgrid::instr::Container::getRoot()->type_->getOrCreateEventType(#cat); \ \ - std::string cont_name = std::string("rank-" + std::to_string(simgrid::s4u::Actor::self()->getPid())); \ + std::string cont_name = std::string("rank-" + std::to_string(simgrid::s4u::this_actor::getPid())); \ type->addEntityValue(Colls::mpi_coll_##cat##_description[i].name, "1.0 1.0 1.0"); \ new simgrid::instr::NewEvent(SIMIX_get_clock(), simgrid::instr::Container::byName(cont_name), type, \ type->getEntityValue(Colls::mpi_coll_##cat##_description[i].name)); \ diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index ea22f3afa1..5f8f451271 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -56,7 +56,7 @@ void smpi_execute(double duration) if (duration >= smpi_cpu_threshold) { XBT_DEBUG("Sleep for %g to handle real computation time", duration); double flops = duration * smpi_host_speed; - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); TRACE_smpi_computing_in(rank, flops); smpi_execute_flops(flops); @@ -158,7 +158,7 @@ void smpi_bench_end() #if HAVE_PAPI if (xbt_cfg_get_string("smpi/papi-events")[0] != '\0' && TRACE_smpi_is_enabled()) { container_t container = - new simgrid::instr::Container(std::string("rank-") + std::to_string(simgrid::s4u::Actor::self()->getPid())); + new simgrid::instr::Container(std::string("rank-") + std::to_string(simgrid::s4u::this_actor::getPid)); papi_counter_t& counter_data = smpi_process()->papi_counters(); for (auto const& pair : counter_data) { @@ -263,7 +263,7 @@ public: SampleLocation(bool global, const char* file, int line) : std::string(std::string(file) + ":" + std::to_string(line)) { if (not global) - this->append(":" + std::to_string(simgrid::s4u::Actor::self()->getPid())); + this->append(":" + std::to_string(simgrid::s4u::this_actor::getPid())); } }; diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 069b7f2f2b..b52f69a32e 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -114,7 +114,7 @@ void smpi_process_init(int *argc, char ***argv){ } int smpi_process_index(){ - return simgrid::s4u::Actor::self()->getPid(); + return simgrid::s4u::this_actor::getPid(); } void * smpi_process_get_user_data(){ diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index ab965b748e..57c7031eff 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -47,12 +47,12 @@ static void log_timed_action(simgrid::xbt::ReplayAction& action, double clock) static std::vector* get_reqq_self() { - return reqq.at(Actor::self()->getPid()); + return reqq.at(simgrid::s4u::this_actor::getPid()); } static void set_reqq_self(std::vector *mpi_request) { - reqq.insert({Actor::self()->getPid(), mpi_request}); + reqq.insert({simgrid::s4u::this_actor::getPid(), mpi_request}); } /* Helper function */ @@ -397,7 +397,7 @@ protected: int my_proc_id; public: - explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::Actor::self()->getPid()) {} + explicit ReplayAction(std::string name) : name(name), my_proc_id(simgrid::s4u::this_actor::getPid()) {} virtual void execute(simgrid::xbt::ReplayAction& action) { @@ -807,7 +807,7 @@ void smpi_replay_init(int* argc, char*** argv) smpi_process()->mark_as_initialized(); smpi_process()->set_replaying(true); - int my_proc_id = Actor::self()->getPid(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); TRACE_smpi_init(my_proc_id); TRACE_smpi_computing_init(my_proc_id); TRACE_smpi_comm_in(my_proc_id, "smpi_replay_run_init", new simgrid::instr::NoOpTIData("init")); @@ -881,12 +881,13 @@ void smpi_replay_main(int* argc, char*** argv) smpi_free_replay_tmp_buffers(); } - TRACE_smpi_comm_in(Actor::self()->getPid(), "smpi_replay_run_finalize", new simgrid::instr::NoOpTIData("finalize")); + TRACE_smpi_comm_in(simgrid::s4u::this_actor::getPid(), "smpi_replay_run_finalize", + new simgrid::instr::NoOpTIData("finalize")); smpi_process()->finalize(); - TRACE_smpi_comm_out(Actor::self()->getPid()); - TRACE_smpi_finalize(Actor::self()->getPid()); + TRACE_smpi_comm_out(simgrid::s4u::this_actor::getPid()); + TRACE_smpi_finalize(simgrid::s4u::this_actor::getPid()); } /** @brief chain a replay initialization and a replay start */ diff --git a/src/smpi/mpi/smpi_f2c.cpp b/src/smpi/mpi/smpi_f2c.cpp index 1bc9a7f21e..920650f2a3 100644 --- a/src/smpi/mpi/smpi_f2c.cpp +++ b/src/smpi/mpi/smpi_f2c.cpp @@ -39,7 +39,7 @@ char* F2C::get_key(char* key, int id) { } char* F2C::get_key_id(char* key, int id) { - std::snprintf(key, KEY_SIZE, "%x_%ld", static_cast(id), simgrid::s4u::Actor::self()->getPid()); + std::snprintf(key, KEY_SIZE, "%x_%ld", static_cast(id), simgrid::s4u::this_actor::getPid()); return key; } diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index 6b461e181e..cff18d4fc7 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -178,19 +178,19 @@ void Request::print_request(const char *message) MPI_Request Request::send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::Actor::self()->getPid(), + return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::getPid(), comm->group()->actor(dst)->getPid(), tag, comm, PERSISTENT | SEND | PREPARED); } MPI_Request Request::ssend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::Actor::self()->getPid(), + return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::getPid(), comm->group()->actor(dst)->getPid(), tag, comm, PERSISTENT | SSEND | SEND | PREPARED); } MPI_Request Request::isend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::Actor::self()->getPid(), + return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::getPid(), comm->group()->actor(dst)->getPid(), tag, comm, PERSISTENT | ISEND | SEND | PREPARED); } @@ -216,7 +216,7 @@ MPI_Request Request::recv_init(void *buf, int count, MPI_Datatype datatype, int { return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(src)->getPid(), - simgrid::s4u::Actor::self()->getPid(), tag, comm, PERSISTENT | RECV | PREPARED); + simgrid::s4u::this_actor::getPid(), tag, comm, PERSISTENT | RECV | PREPARED); } MPI_Request Request::rma_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int dst, int tag, MPI_Comm comm, @@ -238,13 +238,13 @@ MPI_Request Request::irecv_init(void *buf, int count, MPI_Datatype datatype, int { return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(src)->getPid(), - simgrid::s4u::Actor::self()->getPid(), tag, comm, PERSISTENT | RECV | PREPARED); + simgrid::s4u::this_actor::getPid(), tag, comm, PERSISTENT | RECV | PREPARED); } MPI_Request Request::isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::Actor::self()->getPid(), + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::getPid(), comm->group()->actor(dst)->getPid(), tag, comm, NON_PERSISTENT | ISEND | SEND); request->start(); return request; @@ -253,7 +253,7 @@ MPI_Request Request::isend(void *buf, int count, MPI_Datatype datatype, int dst, MPI_Request Request::issend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::Actor::self()->getPid(), + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::getPid(), comm->group()->actor(dst)->getPid(), tag, comm, NON_PERSISTENT | ISEND | SSEND | SEND); request->start(); return request; @@ -265,7 +265,7 @@ MPI_Request Request::irecv(void *buf, int count, MPI_Datatype datatype, int src, MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(src)->getPid(), - simgrid::s4u::Actor::self()->getPid(), tag, comm, NON_PERSISTENT | RECV); + simgrid::s4u::this_actor::getPid(), tag, comm, NON_PERSISTENT | RECV); request->start(); return request; } @@ -281,7 +281,7 @@ void Request::recv(void *buf, int count, MPI_Datatype datatype, int src, int tag void Request::send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::Actor::self()->getPid(), + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::getPid(), comm->group()->actor(dst)->getPid(), tag, comm, NON_PERSISTENT | SEND); request->start(); @@ -292,7 +292,7 @@ void Request::send(void *buf, int count, MPI_Datatype datatype, int dst, int tag void Request::ssend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::Actor::self()->getPid(), + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::getPid(), comm->group()->actor(dst)->getPid(), tag, comm, NON_PERSISTENT | SSEND | SEND); request->start(); @@ -306,7 +306,7 @@ void Request::sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,int d { MPI_Request requests[2]; MPI_Status stats[2]; - int myid = simgrid::s4u::Actor::self()->getPid(); + int myid = simgrid::s4u::this_actor::getPid(); if ((comm->group()->actor(dst)->getPid() == myid) && (comm->group()->actor(src)->getPid() == myid)){ Datatype::copy(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype); if(status !=MPI_STATUS_IGNORE){ @@ -635,9 +635,9 @@ void Request::iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* static int nsleeps = 1; double speed = simgrid::s4u::Actor::self()->getHost()->getSpeed(); double maxrate = xbt_cfg_get_double("smpi/iprobe-cpu-usage"); - MPI_Request request = new Request( - nullptr, 0, MPI_CHAR, source == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(source)->getPid(), - simgrid::s4u::Actor::self()->getPid(), tag, comm, PERSISTENT | RECV); + MPI_Request request = new Request(nullptr, 0, MPI_CHAR, + source == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(source)->getPid(), + simgrid::s4u::this_actor::getPid(), tag, comm, PERSISTENT | RECV); if (smpi_iprobe_sleep > 0) { smx_activity_t iprobe_sleep = simcall_execution_start( "iprobe", /* flops to executek*/ nsleeps * smpi_iprobe_sleep * speed * maxrate, /* priority */ 1.0, @@ -727,7 +727,7 @@ void Request::finish_wait(MPI_Request* request, MPI_Status * status) } if (TRACE_smpi_view_internals() && ((req->flags_ & RECV) != 0)){ - int rank = simgrid::s4u::Actor::self()->getPid(); + int rank = simgrid::s4u::this_actor::getPid(); int src_traced = (req->src_ == MPI_ANY_SOURCE ? req->real_src_ : req->src_); TRACE_smpi_recv(src_traced, rank,req->tag_); } -- 2.20.1