X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6f536df44e36ac12984106ae7c0e2784e45b30d6..aec830b8423c13c5c31e3db71361a449bfacd8ed:/src/smpi/bindings/smpi_pmpi_request.cpp diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index 87f437513e..82d2642913 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,6 +11,13 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); +static int getPid(MPI_Comm, int); +static int getPid(MPI_Comm comm, int id) +{ + simgrid::s4u::ActorPtr actor = comm->group()->actor(id); + return (actor == nullptr) ? MPI_UNDEFINED : actor->getPid(); +} + /* PMPI User level calls */ extern "C" { // Obviously, the C MPI interface should use the C linkage @@ -157,17 +164,17 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP retval = MPI_ERR_TAG; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("Irecv", comm->group()->index(src), - datatype->is_basic() ? count : count * datatype->size(), + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Irecv", src, + datatype->is_replayable() ? count : count * datatype->size(), encode_datatype(datatype))); *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -198,19 +205,19 @@ 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 rank = smpi_process()->index(); - int trace_dst = comm->group()->index(dst); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("Isend", trace_dst, - datatype->is_basic() ? count : count * datatype->size(), + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int trace_dst = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Isend", dst, + datatype->is_replayable() ? count : count * datatype->size(), encode_datatype(datatype))); - TRACE_smpi_send(rank, rank, trace_dst, tag, count * datatype->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, trace_dst, tag, count * datatype->size()); *request = simgrid::smpi::Request::isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -240,18 +247,18 @@ 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 rank = smpi_process()->index(); - int trace_dst = comm->group()->index(dst); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("ISsend", trace_dst, - datatype->is_basic() ? count : count * datatype->size(), + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int trace_dst = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("ISsend", dst, + datatype->is_replayable() ? count : count * datatype->size(), encode_datatype(datatype))); - TRACE_smpi_send(rank, rank, trace_dst, tag, count * datatype->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, trace_dst, tag, count * datatype->size()); *request = simgrid::smpi::Request::issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -280,11 +287,10 @@ 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 rank = smpi_process()->index(); - int src_traced = comm->group()->index(src); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("recv", src_traced, - datatype->is_basic() ? count : count * datatype->size(), + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("recv", src, + datatype->is_replayable() ? count : count * datatype->size(), encode_datatype(datatype))); simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); @@ -292,12 +298,12 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) if (status != MPI_STATUS_IGNORE) { - src_traced = comm->group()->index(status->MPI_SOURCE); + int src_traced = getPid(comm, status->MPI_SOURCE); if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(src_traced, rank, tag); + TRACE_smpi_recv(src_traced, my_proc_id, tag); } } - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -323,20 +329,20 @@ 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 rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("send", dst_traced, - datatype->is_basic() ? count : count * datatype->size(), + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int dst_traced = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("send", dst, + datatype->is_replayable() ? count : count * datatype->size(), encode_datatype(datatype))); if (not TRACE_smpi_view_internals()) { - TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, tag, count * datatype->size()); } simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -361,18 +367,18 @@ 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 rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - TRACE_smpi_comm_in(rank, __FUNCTION__, - new simgrid::instr::Pt2PtTIData("Ssend", dst_traced, - datatype->is_basic() ? count : count * datatype->size(), + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int dst_traced = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + new simgrid::instr::Pt2PtTIData("Ssend", dst, + datatype->is_replayable() ? count : count * datatype->size(), encode_datatype(datatype))); - TRACE_smpi_send(rank, rank, dst_traced, tag, count * datatype->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, tag, count * datatype->size()); simgrid::smpi::Request::ssend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_comm_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -390,10 +396,17 @@ int PMPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, retval = MPI_ERR_COMM; } else if (not sendtype->is_valid() || not recvtype->is_valid()) { retval = MPI_ERR_TYPE; - } else if (src == MPI_PROC_NULL || dst == MPI_PROC_NULL) { - simgrid::smpi::Status::empty(status); - status->MPI_SOURCE = MPI_PROC_NULL; - retval = MPI_SUCCESS; + } else if (src == MPI_PROC_NULL) { + if(status!=MPI_STATUS_IGNORE){ + simgrid::smpi::Status::empty(status); + status->MPI_SOURCE = MPI_PROC_NULL; + } + if(dst != MPI_PROC_NULL) + simgrid::smpi::Request::send(sendbuf, sendcount, sendtype, dst, sendtag, comm); + retval = MPI_SUCCESS; + }else if (dst == MPI_PROC_NULL){ + simgrid::smpi::Request::recv(recvbuf, recvcount, recvtype, src, recvtag, comm, status); + retval = MPI_SUCCESS; }else if (dst >= comm->group()->size() || dst <0 || (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0))){ retval = MPI_ERR_RANK; @@ -403,26 +416,29 @@ 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 rank = smpi_process()->index(); - int dst_traced = comm->group()->index(dst); - int src_traced = comm->group()->index(src); + int my_proc_id = simgrid::s4u::Actor::self()->getPid(); + int dst_traced = getPid(comm, dst); + int src_traced = getPid(comm, src); // FIXME: Hack the way to trace this one - TRACE_smpi_comm_in(rank, __FUNCTION__, + 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(my_proc_id, __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_replayable() ? sendcount : sendcount * sendtype->size(), + dst_hack, recvtype->is_replayable() ? recvcount : recvcount * recvtype->size(), src_hack, + encode_datatype(sendtype), encode_datatype(recvtype))); - TRACE_smpi_send(rank, rank, dst_traced, sendtag, sendcount * sendtype->size()); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, sendtag, sendcount * sendtype->size()); simgrid::smpi::Request::sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); retval = MPI_SUCCESS; - TRACE_smpi_recv(src_traced, rank, recvtag); - TRACE_smpi_comm_out(rank); + TRACE_smpi_recv(src_traced, my_proc_id, recvtag); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -461,13 +477,13 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) simgrid::smpi::Status::empty(status); retval = MPI_SUCCESS; } else { - int rank = ((*request)->comm() != MPI_COMM_NULL) ? smpi_process()->index() : -1; + int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::Actor::self()->getPid() : -1; - TRACE_smpi_testing_in(rank); + TRACE_smpi_testing_in(my_proc_id); *flag = simgrid::smpi::Request::test(request,status); - TRACE_smpi_testing_out(rank); + TRACE_smpi_testing_out(my_proc_id); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -545,6 +561,23 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu return retval; } +// TODO: cheinrich: Move declaration to other file? Rename this function - it's used for PMPI_Wait*? +static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status); +static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status) +{ + MPI_Request req = *request; + if (req != MPI_REQUEST_NULL) { // Received requests become null + int src_traced = req->src(); + // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) + int dst_traced = req->dst(); + if (req->flags() & RECV) { // Is this request a wait for RECV? + if (src_traced == MPI_ANY_SOURCE) + src_traced = (status != MPI_STATUSES_IGNORE) ? req->comm()->group()->rank(status->MPI_SOURCE) : req->src(); + TRACE_smpi_recv(src_traced, dst_traced, req->tag()); + } + } +} + int PMPI_Wait(MPI_Request * request, MPI_Status * status) { int retval = 0; @@ -558,25 +591,18 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) } else if (*request == MPI_REQUEST_NULL) { retval = MPI_SUCCESS; } else { - int rank = (*request)->comm() != MPI_COMM_NULL ? smpi_process()->index() : -1; + int my_proc_id = (*request)->comm() != MPI_COMM_NULL + ? simgrid::s4u::Actor::self()->getPid() + : -1; // TODO: cheinrich: Check if this correct or if it should be MPI_UNDEFINED - int src_traced = (*request)->src(); - int dst_traced = (*request)->dst(); - int tag_traced= (*request)->tag(); - MPI_Comm comm = (*request)->comm(); - int is_wait_for_receive = ((*request)->flags() & RECV); - TRACE_smpi_comm_in(rank, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); + TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); simgrid::smpi::Request::wait(request, status); retval = MPI_SUCCESS; //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - TRACE_smpi_comm_out(rank); - if (is_wait_for_receive) { - if(src_traced==MPI_ANY_SOURCE) - src_traced = (status != MPI_STATUS_IGNORE) ? comm->group()->rank(status->MPI_SOURCE) : src_traced; - TRACE_smpi_recv(src_traced, dst_traced, tag_traced); - } + TRACE_smpi_comm_out(my_proc_id); + trace_smpi_recv_helper(request, status); } smpi_bench_begin(); @@ -592,41 +618,16 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta return MPI_SUCCESS; smpi_bench_end(); - //save requests information for tracing - struct savedvalstype { - int src; - int dst; - int recv; - int tag; - MPI_Comm comm; - }; - savedvalstype* savedvals = xbt_new0(savedvalstype, count); - for (int i = 0; i < count; i++) { - MPI_Request req = requests[i]; //already received requests are no longer valid - if (req) { - savedvals[i]=(savedvalstype){req->src(), req->dst(), (req->flags() & RECV), req->tag(), req->comm()}; - } - } - int rank_traced = smpi_process()->index(); + int rank_traced = simgrid::s4u::Actor::self()->getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::CpuTIData("waitAny", static_cast(count))); *index = simgrid::smpi::Request::waitany(count, requests, status); if(*index!=MPI_UNDEFINED){ - int src_traced = savedvals[*index].src; - //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int dst_traced = savedvals[*index].dst; - int is_wait_for_receive = savedvals[*index].recv; - if (is_wait_for_receive) { - if(savedvals[*index].src==MPI_ANY_SOURCE) - src_traced = (status != MPI_STATUSES_IGNORE) ? savedvals[*index].comm->group()->rank(status->MPI_SOURCE) - : savedvals[*index].src; - TRACE_smpi_recv(src_traced, dst_traced, savedvals[*index].tag); - } + trace_smpi_recv_helper(&requests[*index], status); TRACE_smpi_comm_out(rank_traced); } - xbt_free(savedvals); smpi_bench_begin(); return MPI_SUCCESS; @@ -635,46 +636,16 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { smpi_bench_end(); - //save information from requests - struct savedvalstype { - int src; - int dst; - int recv; - int tag; - int valid; - MPI_Comm comm; - }; - savedvalstype* savedvals=xbt_new0(savedvalstype, count); - for (int i = 0; i < count; i++) { - MPI_Request req = requests[i]; - if(req!=MPI_REQUEST_NULL){ - savedvals[i]=(savedvalstype){req->src(), req->dst(), (req->flags() & RECV), req->tag(), 1, req->comm()}; - }else{ - savedvals[i].valid=0; - } - } - int rank_traced = smpi_process()->index(); + int rank_traced = simgrid::s4u::Actor::self()->getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::CpuTIData("waitAll", static_cast(count))); int retval = simgrid::smpi::Request::waitall(count, requests, status); for (int i = 0; i < count; i++) { - if(savedvals[i].valid){ - // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - int src_traced = savedvals[i].src; - int dst_traced = savedvals[i].dst; - int is_wait_for_receive = savedvals[i].recv; - if (is_wait_for_receive) { - if(src_traced==MPI_ANY_SOURCE) - src_traced = (status != MPI_STATUSES_IGNORE) ? savedvals[i].comm->group()->rank(status[i].MPI_SOURCE) - : savedvals[i].src; - TRACE_smpi_recv(src_traced, dst_traced,savedvals[i].tag); - } - } + trace_smpi_recv_helper(&requests[i], &status[i]); } TRACE_smpi_comm_out(rank_traced); - xbt_free(savedvals); smpi_bench_begin(); return retval;