From: Arnaud Giersch Date: Mon, 19 Apr 2021 16:32:58 +0000 (+0200) Subject: Use type aid_t for process id. in instr_smpi. X-Git-Tag: v3.28~449 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fb5dcd3589886a5f3845bbdd77fab5edbb82a842 Use type aid_t for process id. in instr_smpi. --- diff --git a/src/instr/instr_smpi.hpp b/src/instr/instr_smpi.hpp index d541ed917e..9106edb981 100644 --- a/src/instr/instr_smpi.hpp +++ b/src/instr/instr_smpi.hpp @@ -11,16 +11,16 @@ #include /* Helper functions */ -XBT_PRIVATE simgrid::instr::Container* smpi_container(int rank); -XBT_PRIVATE void TRACE_smpi_setup_container(int rank, const_sg_host_t host); - -XBT_PRIVATE void TRACE_smpi_sleeping_out(int rank); -XBT_PRIVATE void TRACE_smpi_sleeping_in(int rank, double duration); -XBT_PRIVATE void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* extra); -XBT_PRIVATE void TRACE_smpi_comm_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, const std::string& calling_func); +XBT_PRIVATE simgrid::instr::Container* smpi_container(aid_t pid); +XBT_PRIVATE void TRACE_smpi_setup_container(aid_t pid, const_sg_host_t host); + +XBT_PRIVATE void TRACE_smpi_sleeping_out(aid_t pid); +XBT_PRIVATE void TRACE_smpi_sleeping_in(aid_t pid, double duration); +XBT_PRIVATE void TRACE_smpi_comm_in(aid_t pid, const char* operation, simgrid::instr::TIData* extra); +XBT_PRIVATE void TRACE_smpi_comm_out(aid_t pid); +XBT_PRIVATE void TRACE_smpi_send(aid_t rank, aid_t src, aid_t dst, int tag, int size); +XBT_PRIVATE void TRACE_smpi_recv(aid_t src, aid_t dst, int tag); +XBT_PRIVATE void TRACE_smpi_init(aid_t pid, const std::string& calling_func); class smpi_trace_call_location_t { public: diff --git a/src/smpi/bindings/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp index 72cb977927..26e4e96dfb 100644 --- a/src/smpi/bindings/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -51,8 +51,7 @@ int PMPI_Init(int*, char***) } simgrid::smpi::ActorExt::init(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); - TRACE_smpi_init(rank_traced, __func__); + TRACE_smpi_init(simgrid::s4u::this_actor::get_pid(), __func__); smpi_bench_begin(); smpi_process()->mark_as_initialized(); diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp index 30eef29719..b292a42f09 100644 --- a/src/smpi/bindings/smpi_pmpi_coll.cpp +++ b/src/smpi/bindings/smpi_pmpi_coll.cpp @@ -39,8 +39,8 @@ int PMPI_Ibarrier(MPI_Comm comm, MPI_Request *request) CHECK_REQUEST(2) smpi_bench_end(); - int rank = simgrid::s4u::this_actor::get_pid(); - TRACE_smpi_comm_in(rank, request == MPI_REQUEST_IGNORED ? "PMPI_Barrier" : "PMPI_Ibarrier", + aid_t pid = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Barrier" : "PMPI_Ibarrier", new simgrid::instr::NoOpTIData(request == MPI_REQUEST_IGNORED ? "barrier" : "ibarrier")); if (request == MPI_REQUEST_IGNORED) { simgrid::smpi::colls::barrier(comm); @@ -49,7 +49,7 @@ int PMPI_Ibarrier(MPI_Comm comm, MPI_Request *request) } else simgrid::smpi::colls::ibarrier(comm, request); - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(pid); smpi_bench_begin(); return MPI_SUCCESS; } @@ -71,7 +71,7 @@ int PMPI_Ibcast(void *buf, int count, MPI_Datatype datatype, CHECK_REQUEST(6) smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Bcast" : "PMPI_Ibcast", new simgrid::instr::CollTIData(request == MPI_REQUEST_IGNORED ? "bcast" : "ibcast", root, -1.0, datatype->is_replayable() ? count : count * datatype->size(), -1, @@ -134,7 +134,7 @@ int PMPI_Igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Gather" : "PMPI_Igather", new simgrid::instr::CollTIData( @@ -197,7 +197,7 @@ int PMPI_Igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi real_sendtype = recvtype; } - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); int dt_size_recv = recvtype->is_replayable() ? 1 : recvtype->size(); auto trace_recvcounts = std::make_shared>(); @@ -260,7 +260,7 @@ int PMPI_Iallgather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, v smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Allgather" : "PMPI_Iallggather", new simgrid::instr::CollTIData( @@ -312,7 +312,7 @@ int PMPI_Iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, sendcount = recvcounts[comm->rank()]; sendtype = recvtype; } - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); int dt_size_recv = recvtype->is_replayable() ? 1 : recvtype->size(); auto trace_recvcounts = std::make_shared>(); @@ -377,7 +377,7 @@ int PMPI_Iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, voi smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Scatter" : "PMPI_Iscatter", new simgrid::instr::CollTIData( @@ -433,7 +433,7 @@ int PMPI_Iscatterv(const void* sendbuf, const int* sendcounts, const int* displs smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); int dt_size_send = sendtype->is_replayable() ? 1 : sendtype->size(); auto trace_sendcounts = std::make_shared>(); @@ -483,7 +483,7 @@ int PMPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat CHECK_REQUEST(8) smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Reduce" : "PMPI_Ireduce", new simgrid::instr::CollTIData(request == MPI_REQUEST_IGNORED ? "reduce" : "ireduce", root, 0, @@ -538,7 +538,7 @@ int PMPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype std::vector tmp_sendbuf; const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(pid, request == MPI_REQUEST_IGNORED ? "PMPI_Allreduce" : "PMPI_Iallreduce", new simgrid::instr::CollTIData(request == MPI_REQUEST_IGNORED ? "allreduce" : "iallreduce", -1, 0, @@ -573,7 +573,7 @@ int PMPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datat CHECK_OP(5, op, datatype) smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); std::vector tmp_sendbuf; const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); @@ -610,7 +610,7 @@ int PMPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype dat CHECK_OP(5, op, datatype) smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); std::vector tmp_sendbuf; const void* real_sendbuf = smpi_get_in_place_buf(sendbuf, recvbuf, tmp_sendbuf, count, datatype); @@ -653,7 +653,7 @@ int PMPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcoun } smpi_bench_end(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); auto trace_recvcounts = std::make_shared>(); int dt_send_size = datatype->is_replayable() ? 1 : datatype->size(); int totalcount = 0; @@ -702,7 +702,7 @@ int PMPI_Ireduce_scatter_block(const void* sendbuf, void* recvbuf, int recvcount smpi_bench_end(); int count = comm->size(); - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); int dt_send_size = datatype->is_replayable() ? 1 : datatype->size(); auto trace_recvcounts = std::make_shared>(recvcount * dt_send_size); // copy data to avoid bad free std::vector tmp_sendbuf; @@ -748,7 +748,7 @@ int PMPI_Ialltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, vo CHECK_BUFFER(4, recvbuf, recvcount, recvtype) CHECK_REQUEST(8) - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); int real_sendcount = sendcount; MPI_Datatype real_sendtype = sendtype; @@ -808,7 +808,7 @@ int PMPI_Ialltoallv(const void* sendbuf, const int* sendcounts, const int* sendd CHECK_NULL(7, MPI_ERR_ARG, recvdispls) CHECK_REQUEST(10) - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); int size = comm->size(); for (int i = 0; i < size; i++) { if(sendbuf != MPI_IN_PLACE){ @@ -902,7 +902,7 @@ int PMPI_Ialltoallw(const void* sendbuf, const int* sendcounts, const int* sendd CHECK_NULL(7, MPI_ERR_ARG, recvdispls) CHECK_NULL(8, MPI_ERR_TYPE, recvtypes) CHECK_REQUEST(10) - int pid = simgrid::s4u::this_actor::get_pid(); + aid_t pid = simgrid::s4u::this_actor::get_pid(); int size = comm->size(); for (int i = 0; i < size; i++) { if(sendbuf != MPI_IN_PLACE){ diff --git a/src/smpi/bindings/smpi_pmpi_file.cpp b/src/smpi/bindings/smpi_pmpi_file.cpp index 371f562acd..1cf3dbee0e 100644 --- a/src/smpi/bindings/smpi_pmpi_file.cpp +++ b/src/smpi/bindings/smpi_pmpi_file.cpp @@ -101,7 +101,7 @@ int PMPI_File_read(MPI_File fh, void *buf, int count,MPI_Datatype datatype, MPI_ CHECK_WRONLY(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read", count * datatype->size())); int ret = simgrid::smpi::File::read(fh, buf, count, datatype, status); TRACE_smpi_comm_out(rank_traced); @@ -114,7 +114,7 @@ int PMPI_File_read_shared(MPI_File fh, void *buf, int count,MPI_Datatype datatyp CHECK_WRONLY(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read_shared", count * datatype->size())); int ret = simgrid::smpi::File::read_shared(fh, buf, count, datatype, status); @@ -128,7 +128,7 @@ int PMPI_File_write(MPI_File fh, const void *buf, int count,MPI_Datatype datatyp CHECK_RDONLY(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write", count * datatype->size())); int ret = simgrid::smpi::File::write(fh, const_cast(buf), count, datatype, status); TRACE_smpi_comm_out(rank_traced); @@ -141,7 +141,7 @@ int PMPI_File_write_shared(MPI_File fh, const void *buf, int count,MPI_Datatype CHECK_RDONLY(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write_shared", count * datatype->size())); int ret = simgrid::smpi::File::write_shared(fh, buf, count, datatype, status); @@ -154,7 +154,7 @@ int PMPI_File_read_all(MPI_File fh, void *buf, int count,MPI_Datatype datatype, CHECK_FILE_INPUTS CHECK_WRONLY(fh) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read_all", count * datatype->size())); int ret = fh->op_all(buf, count, datatype, status); TRACE_smpi_comm_out(rank_traced); @@ -166,7 +166,7 @@ int PMPI_File_read_ordered(MPI_File fh, void *buf, int count,MPI_Datatype dataty CHECK_FILE_INPUTS CHECK_WRONLY(fh) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read_ordered", count * datatype->size())); int ret = simgrid::smpi::File::read_ordered(fh, buf, count, datatype, status); @@ -179,7 +179,7 @@ int PMPI_File_write_all(MPI_File fh, const void *buf, int count,MPI_Datatype dat CHECK_FILE_INPUTS CHECK_RDONLY(fh) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write_all", count * datatype->size())); int ret = fh->op_all(const_cast(buf), count, datatype, status); TRACE_smpi_comm_out(rank_traced); @@ -191,7 +191,7 @@ int PMPI_File_write_ordered(MPI_File fh, const void *buf, int count,MPI_Datatype CHECK_FILE_INPUTS CHECK_RDONLY(fh) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write_ordered", count * datatype->size())); int ret = simgrid::smpi::File::write_ordered(fh, buf, count, datatype, status); @@ -205,7 +205,7 @@ int PMPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf, int count,MPI_D CHECK_WRONLY(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read", count * datatype->size())); int ret = fh->seek(offset,MPI_SEEK_SET); if(ret!=MPI_SUCCESS) @@ -220,7 +220,7 @@ int PMPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void *buf, int count,M CHECK_FILE_INPUT_OFFSET CHECK_WRONLY(fh) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - read_at_all", count * datatype->size())); int ret = fh->seek(offset,MPI_SEEK_SET); @@ -237,7 +237,7 @@ int PMPI_File_write_at(MPI_File fh, MPI_Offset offset, const void *buf, int coun CHECK_RDONLY(fh) PASS_ZEROCOUNT(count) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write", count * datatype->size())); int ret = fh->seek(offset,MPI_SEEK_SET); if(ret!=MPI_SUCCESS) @@ -252,7 +252,7 @@ int PMPI_File_write_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int CHECK_FILE_INPUT_OFFSET CHECK_RDONLY(fh) smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::get_pid(); + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("IO - write_at_all", count * datatype->size())); int ret = fh->seek(offset,MPI_SEEK_SET); diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index 4871b408dd..e0abad66de 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -11,7 +11,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); -static int getPid(MPI_Comm comm, int id) +static aid_t getPid(MPI_Comm comm, int id) { return comm->group()->actor(id); } @@ -99,7 +99,7 @@ int PMPI_Start(MPI_Request * request) retval = MPI_ERR_REQUEST; } else { MPI_Request req = *request; - int my_proc_id = (req->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; + aid_t my_proc_id = (req->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Start", req->dst(), req->size(), @@ -133,7 +133,7 @@ int PMPI_Startall(int count, MPI_Request * requests) } } if(retval != MPI_ERR_REQUEST) { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Startall")); if (not TRACE_smpi_view_internals()) for (int i = 0; i < count; i++) { @@ -177,7 +177,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP CHECK_IRECV_INPUTS smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("irecv", src, datatype->is_replayable() ? count : count * datatype->size(), @@ -195,8 +195,8 @@ int PMPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dst, int t smpi_bench_end(); int retval = 0; - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int trace_dst = getPid(comm, dst); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t trace_dst = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("isend", dst, datatype->is_replayable() ? count : count * datatype->size(), @@ -221,8 +221,8 @@ int PMPI_Issend(const void* buf, int count, MPI_Datatype datatype, int dst, int CHECK_ISEND_INPUTS smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int trace_dst = getPid(comm, dst); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t trace_dst = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("ISsend", dst, datatype->is_replayable() ? count : count * datatype->size(), @@ -254,7 +254,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI } else if (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0)){ retval = MPI_ERR_RANK; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("recv", src, datatype->is_replayable() ? count : count * datatype->size(), @@ -263,12 +263,8 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI retval = simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int src_traced=0; - if (status != MPI_STATUS_IGNORE) - src_traced = getPid(comm, status->MPI_SOURCE); - else - src_traced = getPid(comm, src); if (not TRACE_smpi_view_internals()) { + aid_t src_traced = (status != MPI_STATUS_IGNORE) ? getPid(comm, status->MPI_SOURCE) : getPid(comm, src); TRACE_smpi_recv(src_traced, my_proc_id, tag); } @@ -284,8 +280,8 @@ int PMPI_Send(const void *buf, int count, MPI_Datatype datatype, int dst, int ta CHECK_SEND_INPUTS smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int dst_traced = getPid(comm, dst); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("send", dst, datatype->is_replayable() ? count : count * datatype->size(), @@ -309,8 +305,8 @@ int PMPI_Bsend(const void* buf, int count, MPI_Datatype datatype, int dst, int t CHECK_SEND_INPUTS smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int dst_traced = getPid(comm, dst); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = getPid(comm, dst); int bsend_buf_size = 0; void* bsend_buf = nullptr; smpi_process()->bsend_buffer(&bsend_buf, &bsend_buf_size); @@ -335,8 +331,8 @@ int PMPI_Ibsend(const void* buf, int count, MPI_Datatype datatype, int dst, int CHECK_ISEND_INPUTS smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int trace_dst = getPid(comm, dst); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t trace_dst = getPid(comm, dst); int bsend_buf_size = 0; void* bsend_buf = nullptr; smpi_process()->bsend_buffer(&bsend_buf, &bsend_buf_size); @@ -378,8 +374,8 @@ int PMPI_Ssend(const void* buf, int count, MPI_Datatype datatype, int dst, int t CHECK_SEND_INPUTS smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int dst_traced = getPid(comm, dst); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Ssend", dst, datatype->is_replayable() ? count : count * datatype->size(), @@ -422,9 +418,9 @@ int PMPI_Sendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0))){ retval = MPI_ERR_RANK; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int dst_traced = getPid(comm, dst); - int src_traced = getPid(comm, src); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = getPid(comm, dst); + aid_t src_traced = getPid(comm, src); // FIXME: Hack the way to trace this one auto dst_hack = std::make_shared>(); @@ -484,7 +480,7 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) } retval = MPI_SUCCESS; } else { - int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; + aid_t my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test")); retval = simgrid::smpi::Request::test(request,status, flag); @@ -503,7 +499,7 @@ int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_S if (index == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testany")); retval = simgrid::smpi::Request::testany(count, requests, index, flag, status); TRACE_smpi_comm_out(my_proc_id); @@ -520,7 +516,7 @@ int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* status if (flag == nullptr) { retval = MPI_ERR_ARG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testall")); retval = simgrid::smpi::Request::testall(count, requests, flag, statuses); TRACE_smpi_comm_out(my_proc_id); @@ -537,7 +533,7 @@ int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indic if (outcount == nullptr) { retval = MPI_ERR_ARG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testsome")); retval = simgrid::smpi::Request::testsome(incount, requests, outcount, indices, status); TRACE_smpi_comm_out(my_proc_id); @@ -598,8 +594,8 @@ static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status) const simgrid::smpi::Request* req = *request; // Requests already received are null. Is this request a wait for RECV? if (req != MPI_REQUEST_NULL && (req->flags() & MPI_REQ_RECV)) { - int src_traced = req->src(); - int dst_traced = req->dst(); + aid_t src_traced = req->src(); + aid_t dst_traced = req->dst(); // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) if (src_traced == MPI_ANY_SOURCE && status != MPI_STATUS_IGNORE) src_traced = req->comm()->group()->actor(status->MPI_SOURCE); @@ -627,7 +623,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) else savedreq = MPI_REQUEST_NULL; - int my_proc_id = (*request)->comm() != MPI_COMM_NULL ? simgrid::s4u::this_actor::get_pid() : -1; + aid_t my_proc_id = (*request)->comm() != MPI_COMM_NULL ? simgrid::s4u::this_actor::get_pid() : -1; TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::WaitTIData((*request)->src(), (*request)->dst(), (*request)->tag())); @@ -662,7 +658,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta req = MPI_REQUEST_NULL; } - int rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null? + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null? TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitAny", count)); *index = simgrid::smpi::Request::waitany(count, requests, status); @@ -693,7 +689,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) req = MPI_REQUEST_NULL; } - int rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null? + aid_t rank_traced = simgrid::s4u::this_actor::get_pid(); // FIXME: In PMPI_Wait, we check if the comm is null? TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitall", 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 b3bab893c3..f3ff649850 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -153,7 +153,7 @@ int PMPI_Win_get_group(MPI_Win win, MPI_Group * group){ int PMPI_Win_fence( int assert, MPI_Win win){ CHECK_WIN(2, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_fence")); int retval = win->fence(assert); TRACE_smpi_comm_out(my_proc_id); @@ -170,7 +170,7 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int retval = 0; smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -198,7 +198,7 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype int retval = 0; smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -225,10 +225,10 @@ int PMPI_Put(const void *origin_addr, int origin_count, MPI_Datatype origin_data int retval = 0; smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); - int dst_traced = group->actor(target_rank); + aid_t dst_traced = group->actor(target_rank); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Put", target_rank, origin_datatype->is_replayable() ? origin_count @@ -256,10 +256,10 @@ int PMPI_Rput(const void *origin_addr, int origin_count, MPI_Datatype origin_dat int retval = 0; smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); - int dst_traced = group->actor(target_rank); + aid_t dst_traced = group->actor(target_rank); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData( "Rput", target_rank, @@ -286,7 +286,7 @@ int PMPI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype orig int retval = 0; smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -317,7 +317,7 @@ int PMPI_Raccumulate(const void *origin_addr, int origin_count, MPI_Datatype ori smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -356,7 +356,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ int retval = 0; smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -397,7 +397,7 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ int retval = 0; smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -435,7 +435,7 @@ int PMPI_Compare_and_swap(const void* origin_addr, void* compare_addr, void* res smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); MPI_Group group; win->get_group(&group); TRACE_smpi_comm_in(my_proc_id, __func__, @@ -455,7 +455,7 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ CHECK_GROUP(1, group) CHECK_WIN(2, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_post")); int retval = win->post(group,assert); TRACE_smpi_comm_out(my_proc_id); @@ -467,7 +467,7 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ CHECK_GROUP(1, group) CHECK_WIN(2, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_start")); int retval = win->start(group,assert); TRACE_smpi_comm_out(my_proc_id); @@ -478,7 +478,7 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ int PMPI_Win_complete(MPI_Win win){ CHECK_WIN(1, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_complete")); int retval = win->complete(); TRACE_smpi_comm_out(my_proc_id); @@ -489,7 +489,7 @@ int PMPI_Win_complete(MPI_Win win){ int PMPI_Win_wait(MPI_Win win){ CHECK_WIN(1, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_wait")); int retval = win->wait(); TRACE_smpi_comm_out(my_proc_id); @@ -506,7 +506,7 @@ int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win){ lock_type != MPI_LOCK_SHARED) { retval = MPI_ERR_LOCKTYPE; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); 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); @@ -519,7 +519,7 @@ int PMPI_Win_unlock(int rank, MPI_Win win){ CHECK_WIN(2, win) CHECK_PROC_RMA(1, rank, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_unlock")); int retval = win->unlock(rank); TRACE_smpi_comm_out(my_proc_id); @@ -530,7 +530,7 @@ int PMPI_Win_unlock(int rank, MPI_Win win){ int PMPI_Win_lock_all(int assert, MPI_Win win){ CHECK_WIN(2, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_lock_all")); int retval = win->lock_all(assert); TRACE_smpi_comm_out(my_proc_id); @@ -541,7 +541,7 @@ int PMPI_Win_lock_all(int assert, MPI_Win win){ int PMPI_Win_unlock_all(MPI_Win win){ CHECK_WIN(1, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_unlock_all")); int retval = win->unlock_all(); TRACE_smpi_comm_out(my_proc_id); @@ -553,7 +553,7 @@ int PMPI_Win_flush(int rank, MPI_Win win){ CHECK_WIN(2, win) CHECK_PROC_RMA(1, rank, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush")); int retval = win->flush(rank); TRACE_smpi_comm_out(my_proc_id); @@ -565,7 +565,7 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){ CHECK_WIN(2, win) CHECK_PROC_RMA(1, rank, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_local")); int retval = win->flush_local(rank); TRACE_smpi_comm_out(my_proc_id); @@ -576,7 +576,7 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){ int PMPI_Win_flush_all(MPI_Win win){ CHECK_WIN(1, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_all")); int retval = win->flush_all(); TRACE_smpi_comm_out(my_proc_id); @@ -587,7 +587,7 @@ int PMPI_Win_flush_all(MPI_Win win){ int PMPI_Win_flush_local_all(MPI_Win win){ CHECK_WIN(1, win) smpi_bench_end(); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_local_all")); int retval = win->flush_local_all(); TRACE_smpi_comm_out(my_proc_id); diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 49c6ca3a98..7663c7d48f 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -96,12 +96,12 @@ static const char* instr_find_color(const char* c_state) return "0.5 0.5 0.5"; // Just in case we find nothing in the map ... } -XBT_PRIVATE simgrid::instr::Container* smpi_container(int rank) +XBT_PRIVATE simgrid::instr::Container* smpi_container(aid_t pid) { - return simgrid::instr::Container::by_name(std::string("rank-") + std::to_string(rank)); + return simgrid::instr::Container::by_name(std::string("rank-") + std::to_string(pid)); } -static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send) +static std::string TRACE_smpi_put_key(aid_t src, aid_t dst, int tag, int send) { //generate the key static unsigned long long counter = 0; @@ -117,7 +117,7 @@ static std::string TRACE_smpi_put_key(int src, int dst, int tag, int send) return key; } -static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send) +static std::string TRACE_smpi_get_key(aid_t src, aid_t dst, int tag, int send) { std::string key; std::string aux = std::to_string(src) + "#" + std::to_string(dst) + "#" + std::to_string(tag) + "#" + @@ -135,27 +135,27 @@ static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send) return key; } -void TRACE_smpi_setup_container(int rank, const_sg_host_t host) +void TRACE_smpi_setup_container(aid_t pid, const_sg_host_t host) { auto* father = simgrid::instr::Container::get_root(); if (TRACE_smpi_is_grouped()) { father = simgrid::instr::Container::by_name_or_null(host->get_name()); - xbt_assert(father != nullptr, "Could not find a parent for mpi rank 'rank-%d' at function %s", rank, __func__); + xbt_assert(father != nullptr, "Could not find a parent for mpi rank 'rank-%ld' at function %s", pid, __func__); } - father->create_child(std::string("rank-") + std::to_string(rank), "MPI"); // This container is of type MPI + father->create_child(std::string("rank-") + std::to_string(pid), "MPI"); // This container is of type MPI } -void TRACE_smpi_init(int rank, const std::string& calling_func) +void TRACE_smpi_init(aid_t pid, const std::string& calling_func) { if (not TRACE_smpi_is_enabled()) return; auto self = simgrid::s4u::Actor::self(); - TRACE_smpi_setup_container(rank, sg_host_self()); + TRACE_smpi_setup_container(pid, sg_host_self()); simgrid::s4u::this_actor::on_exit([self](bool) { smpi_container(self->get_pid())->remove_from_parent(); }); - simgrid::instr::StateType* state = smpi_container(rank)->get_state("MPI_STATE"); + simgrid::instr::StateType* state = smpi_container(pid)->get_state("MPI_STATE"); state->add_entity_value(calling_func, instr_find_color(calling_func.c_str())); state->push_event(calling_func, new simgrid::instr::NoOpTIData("init")); @@ -166,7 +166,7 @@ void TRACE_smpi_init(int rank, const std::string& calling_func) state->add_entity_value("sleeping", instr_find_color("sleeping")); #if HAVE_PAPI - const simgrid::instr::Container* container = smpi_container(rank); + const simgrid::instr::Container* container = smpi_container(pid); papi_counter_t counters = smpi_process()->papi_counters(); for (auto const& it : counters) { @@ -179,56 +179,56 @@ void TRACE_smpi_init(int rank, const std::string& calling_func) #endif } -void TRACE_smpi_sleeping_in(int rank, double duration) +void TRACE_smpi_sleeping_in(aid_t pid, double duration) { if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) - smpi_container(rank) + smpi_container(pid) ->get_state("MPI_STATE") ->push_event("sleeping", new simgrid::instr::CpuTIData("sleep", duration)); } -void TRACE_smpi_sleeping_out(int rank) +void TRACE_smpi_sleeping_out(aid_t pid) { if (TRACE_smpi_is_enabled() && TRACE_smpi_is_sleeping()) - smpi_container(rank)->get_state("MPI_STATE")->pop_event(); + smpi_container(pid)->get_state("MPI_STATE")->pop_event(); } -void TRACE_smpi_comm_in(int rank, const char* operation, simgrid::instr::TIData* extra) +void TRACE_smpi_comm_in(aid_t pid, const char* operation, simgrid::instr::TIData* extra) { if (not TRACE_smpi_is_enabled()) { delete extra; return; } - simgrid::instr::StateType* state = smpi_container(rank)->get_state("MPI_STATE"); + simgrid::instr::StateType* state = smpi_container(pid)->get_state("MPI_STATE"); state->add_entity_value(operation, instr_find_color(operation)); state->push_event(operation, extra); } -void TRACE_smpi_comm_out(int rank) +void TRACE_smpi_comm_out(aid_t pid) { if (TRACE_smpi_is_enabled()) - smpi_container(rank)->get_state("MPI_STATE")->pop_event(); + smpi_container(pid)->get_state("MPI_STATE")->pop_event(); } -void TRACE_smpi_send(int rank, int src, int dst, int tag, int size) +void TRACE_smpi_send(aid_t rank, aid_t src, aid_t dst, int tag, int size) { if (not TRACE_smpi_is_enabled()) return; std::string key = TRACE_smpi_get_key(src, dst, tag, 1); - XBT_DEBUG("Send tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str()); + XBT_DEBUG("Send tracing from %ld to %ld, tag %d, with key %s", src, dst, tag, key.c_str()); simgrid::instr::Container::get_root()->get_link("MPI_LINK")->start_event(smpi_container(rank), "PTP", key, size); } -void TRACE_smpi_recv(int src, int dst, int tag) +void TRACE_smpi_recv(aid_t src, aid_t dst, int tag) { if (not TRACE_smpi_is_enabled()) return; std::string key = TRACE_smpi_get_key(src, dst, tag, 0); - XBT_DEBUG("Recv tracing from %d to %d, tag %d, with key %s", src, dst, tag, key.c_str()); + XBT_DEBUG("Recv tracing from %ld to %ld, tag %d, with key %s", src, dst, tag, key.c_str()); simgrid::instr::Container::get_root()->get_link("MPI_LINK")->end_event(smpi_container(dst), "PTP", key); } diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp index b3cf6c813d..277da718d0 100644 --- a/src/smpi/internals/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -170,12 +170,12 @@ static unsigned int private_sleep(double secs) smpi_bench_end(); XBT_DEBUG("Sleep for: %lf secs", secs); - int rank = simgrid::s4u::this_actor::get_pid(); - TRACE_smpi_sleeping_in(rank, secs); + aid_t pid = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_sleeping_in(pid, secs); simgrid::s4u::this_actor::sleep_for(secs); - TRACE_smpi_sleeping_out(rank); + TRACE_smpi_sleeping_out(pid); smpi_bench_begin(); return 0; diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 97c73047c4..2ec4b0e84b 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -413,7 +413,7 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) return; } - int rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; + aid_t rank = request->comm() != MPI_COMM_NULL ? request->comm()->rank() : -1; // Must be taken before Request::wait() since the request may be set to // MPI_REQUEST_NULL by Request::wait! @@ -432,7 +432,7 @@ void WaitAction::kernel(simgrid::xbt::ReplayAction& action) void SendAction::kernel(simgrid::xbt::ReplayAction&) { const SendRecvParser& args = get_args(); - int dst_traced = MPI_COMM_WORLD->group()->actor(args.partner); + aid_t dst_traced = MPI_COMM_WORLD->group()->actor(args.partner); TRACE_smpi_comm_in( get_pid(), __func__, @@ -497,10 +497,10 @@ void SleepAction::kernel(simgrid::xbt::ReplayAction&) { const SleepParser& args = get_args(); XBT_DEBUG("Sleep for: %lf secs", args.time); - int rank = simgrid::s4u::this_actor::get_pid(); - TRACE_smpi_sleeping_in(rank, args.time); + aid_t pid = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_sleeping_in(pid, args.time); simgrid::s4u::this_actor::sleep_for(args.time/smpi_adjust_comp_speed()); - TRACE_smpi_sleeping_out(rank); + TRACE_smpi_sleeping_out(pid); } void LocationAction::kernel(simgrid::xbt::ReplayAction&) @@ -557,7 +557,7 @@ void WaitAllAction::kernel(simgrid::xbt::ReplayAction&) if (count_requests > 0) { TRACE_smpi_comm_in(get_pid(), __func__, new simgrid::instr::Pt2PtTIData("waitall", -1, count_requests, "")); - std::vector> sender_receiver; + std::vector> sender_receiver; std::vector reqs; req_storage.get_requests(reqs); for (auto const& req : reqs) { @@ -762,9 +762,7 @@ void smpi_replay_init(const char* instance_id, int rank, double start_delay_flop smpi_process()->mark_as_initialized(); smpi_process()->set_replaying(true); - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - - TRACE_smpi_init(my_proc_id, "smpi_replay_run_init"); + TRACE_smpi_init(simgrid::s4u::this_actor::get_pid(), "smpi_replay_run_init"); xbt_replay_action_register("init", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::InitAction().execute(action); }); xbt_replay_action_register("finalize", [](simgrid::xbt::ReplayAction const&) { /* nothing to do */ }); xbt_replay_action_register("comm_size", [](simgrid::xbt::ReplayAction& action) { simgrid::smpi::replay::CommunicatorAction().execute(action); }); diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index e37e60d8ff..9bc54edff0 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -919,8 +919,8 @@ void Request::finish_wait(MPI_Request* request, MPI_Status * status) } if (TRACE_smpi_view_internals() && ((req->flags_ & MPI_REQ_RECV) != 0)) { - int rank = simgrid::s4u::this_actor::get_pid(); - int src_traced = (req->src_ == MPI_ANY_SOURCE ? req->real_src_ : req->src_); + aid_t rank = simgrid::s4u::this_actor::get_pid(); + aid_t src_traced = (req->src_ == MPI_ANY_SOURCE ? req->real_src_ : req->src_); TRACE_smpi_recv(src_traced, rank,req->tag_); } if(req->detached_sender_ != nullptr){