From 8480370e11400915646c80ccc4c31d3d86a70003 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 20 Apr 2021 09:19:32 +0200 Subject: [PATCH] More aid_t. --- src/smpi/internals/smpi_replay.cpp | 2 +- src/smpi/mpi/smpi_win.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp index 0965e9e968..f37bebe5bc 100644 --- a/src/smpi/internals/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -480,7 +480,7 @@ void RecvAction::kernel(simgrid::xbt::ReplayAction&) TRACE_smpi_comm_out(get_pid()); if (is_recv && not TRACE_smpi_view_internals()) { - int src_traced = MPI_COMM_WORLD->group()->actor(status.MPI_SOURCE); + aid_t src_traced = MPI_COMM_WORLD->group()->actor(status.MPI_SOURCE); TRACE_smpi_recv(src_traced, get_pid(), args.tag); } } diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp index 30052361e1..fa51e44be5 100644 --- a/src/smpi/mpi/smpi_win.cpp +++ b/src/smpi/mpi/smpi_win.cpp @@ -672,7 +672,7 @@ int Win::finish_comms(int rank){ // because we only wait for requests that we are responsible for. // Also use the process id here since the request itself returns from src() // and dst() the process id, NOT the rank (which only exists in the context of a communicator). - int proc_id = comm_->group()->actor(rank); + aid_t proc_id = comm_->group()->actor(rank); auto it = std::stable_partition(begin(requests_), end(requests_), [proc_id](const MPI_Request& req) { return (req == MPI_REQUEST_NULL || (req->src() != proc_id && req->dst() != proc_id)); }); -- 2.20.1