From b8539f6b0e7671fedf4fc6b7e98a573f51e63de2 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 9 Nov 2017 12:08:29 +0100 Subject: [PATCH] rework the hack on sendrecv to fix umpire test --- src/smpi/bindings/smpi_pmpi_request.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index 87f437513e..fd9d4a61df 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -408,12 +408,15 @@ int PMPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int src_traced = comm->group()->index(src); // FIXME: Hack the way to trace this one + std::vector* dst_hack = new std::vector; + std::vector* src_hack = new std::vector; + dst_hack->push_back(dst_traced); + src_hack->push_back(src_traced); TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::VarCollTIData( - "sendRecv", -1, sendtype->is_basic() ? sendcount : sendcount * sendtype->size(), - new std::vector(src_traced), - recvtype->is_basic() ? recvcount : recvcount * recvtype->size(), - new std::vector(src_traced), encode_datatype(sendtype), encode_datatype(recvtype))); + "sendRecv", -1, sendtype->is_basic() ? sendcount : sendcount * sendtype->size(), dst_hack, + recvtype->is_basic() ? recvcount : recvcount * recvtype->size(), src_hack, + encode_datatype(sendtype), encode_datatype(recvtype))); TRACE_smpi_send(rank, rank, dst_traced, sendtag, sendcount * sendtype->size()); -- 2.20.1