X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/14ce721da26e13ab7623471469a4f95abc9ac374..e51fd157704f026607d5ef1b79334cb2decf8d5f:/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 6690dfca51..e63ceef911 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -15,11 +15,10 @@ 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(); + return (actor == nullptr) ? MPI_UNDEFINED : actor->get_pid(); } /* PMPI User level calls */ -extern "C" { // Obviously, the C MPI interface should use the C linkage int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request * request) { @@ -90,6 +89,11 @@ int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dst, int ta return retval; } +/* + * This function starts a request returned by init functions such as + * MPI_Send_init(), MPI_Ssend_init (see above), and friends. + * They should already have performed sanity checks. + */ int PMPI_Start(MPI_Request * request) { int retval = 0; @@ -98,8 +102,22 @@ int PMPI_Start(MPI_Request * request) if (request == nullptr || *request == MPI_REQUEST_NULL) { retval = MPI_ERR_REQUEST; } else { - (*request)->start(); + MPI_Request req = *request; + int 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(), + req->tag(), + simgrid::smpi::Datatype::encode(req->type()))); + if (not TRACE_smpi_view_internals() && req->flags() & MPI_REQ_SEND) + TRACE_smpi_send(my_proc_id, my_proc_id, getPid(req->comm(), req->dst()), req->tag(), req->size()); + + req->start(); + + if (not TRACE_smpi_view_internals() && req->flags() & MPI_REQ_RECV) + TRACE_smpi_recv(getPid(req->comm(), req->src()), my_proc_id, req->tag()); retval = MPI_SUCCESS; + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -119,7 +137,25 @@ int PMPI_Startall(int count, MPI_Request * requests) } } if(retval != MPI_ERR_REQUEST) { + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Startall")); + MPI_Request req = MPI_REQUEST_NULL; + if (not TRACE_smpi_view_internals()) + for (int i = 0; i < count; i++) { + req = requests[i]; + if (req->flags() & MPI_REQ_SEND) + TRACE_smpi_send(my_proc_id, my_proc_id, getPid(req->comm(), req->dst()), req->tag(), req->size()); + } + simgrid::smpi::Request::startall(count, requests); + + if (not TRACE_smpi_view_internals()) + for (int i = 0; i < count; i++) { + req = requests[i]; + if (req->flags() & MPI_REQ_RECV) + TRACE_smpi_recv(getPid(req->comm(), req->src()), my_proc_id, req->tag()); + } + TRACE_smpi_comm_out(my_proc_id); } } smpi_bench_begin(); @@ -164,12 +200,12 @@ 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::get_pid(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Irecv", src, datatype->is_replayable() ? count : count * datatype->size(), - encode_datatype(datatype))); + tag, simgrid::smpi::Datatype::encode(datatype))); *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; @@ -205,12 +241,12 @@ 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::get_pid(); int trace_dst = getPid(comm, dst); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Isend", dst, datatype->is_replayable() ? count : count * datatype->size(), - encode_datatype(datatype))); + tag, simgrid::smpi::Datatype::encode(datatype))); TRACE_smpi_send(my_proc_id, my_proc_id, trace_dst, tag, count * datatype->size()); @@ -247,12 +283,12 @@ 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::get_pid(); int trace_dst = getPid(comm, dst); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("ISsend", dst, datatype->is_replayable() ? count : count * datatype->size(), - encode_datatype(datatype))); + tag, simgrid::smpi::Datatype::encode(datatype))); 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); @@ -275,8 +311,10 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (src == MPI_PROC_NULL) { - simgrid::smpi::Status::empty(status); - status->MPI_SOURCE = MPI_PROC_NULL; + if(status != MPI_STATUS_IGNORE){ + simgrid::smpi::Status::empty(status); + status->MPI_SOURCE = MPI_PROC_NULL; + } retval = MPI_SUCCESS; } else if (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0)){ retval = MPI_ERR_RANK; @@ -287,11 +325,11 @@ 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(); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + int 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(), - encode_datatype(datatype))); + tag, simgrid::smpi::Datatype::encode(datatype))); simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); retval = MPI_SUCCESS; @@ -329,12 +367,12 @@ 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::get_pid(); int dst_traced = getPid(comm, dst); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("send", dst, datatype->is_replayable() ? count : count * datatype->size(), - encode_datatype(datatype))); + tag, simgrid::smpi::Datatype::encode(datatype))); if (not TRACE_smpi_view_internals()) { TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, tag, count * datatype->size()); } @@ -367,12 +405,12 @@ 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::get_pid(); int dst_traced = getPid(comm, dst); - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Ssend", dst, datatype->is_replayable() ? count : count * datatype->size(), - encode_datatype(datatype))); + tag, simgrid::smpi::Datatype::encode(datatype))); 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); @@ -396,10 +434,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; @@ -409,7 +454,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::get_pid(); int dst_traced = getPid(comm, dst); int src_traced = getPid(comm, src); @@ -418,11 +463,11 @@ int PMPI_Sendrecv(void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, 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__, + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::VarCollTIData( "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))); + simgrid::smpi::Datatype::encode(sendtype), simgrid::smpi::Datatype::encode(recvtype))); TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, sendtag, sendcount * sendtype->size()); @@ -466,11 +511,13 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) if (request == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { - *flag= true; - simgrid::smpi::Status::empty(status); + if (status != MPI_STATUS_IGNORE){ + *flag= true; + 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::get_pid() : -1; TRACE_smpi_testing_in(my_proc_id); @@ -517,13 +564,13 @@ int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { int retval = 0; smpi_bench_end(); - if (status == nullptr) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { + if (comm == MPI_COMM_NULL) { retval = MPI_ERR_COMM; } else if (source == MPI_PROC_NULL) { - simgrid::smpi::Status::empty(status); - status->MPI_SOURCE = MPI_PROC_NULL; + if (status != MPI_STATUS_IGNORE){ + simgrid::smpi::Status::empty(status); + status->MPI_SOURCE = MPI_PROC_NULL; + } retval = MPI_SUCCESS; } else { simgrid::smpi::Request::probe(source, tag, comm, status); @@ -543,8 +590,10 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu retval = MPI_ERR_COMM; } else if (source == MPI_PROC_NULL) { *flag=true; - simgrid::smpi::Status::empty(status); - status->MPI_SOURCE = MPI_PROC_NULL; + if (status != MPI_STATUS_IGNORE){ + simgrid::smpi::Status::empty(status); + status->MPI_SOURCE = MPI_PROC_NULL; + } retval = MPI_SUCCESS; } else { simgrid::smpi::Request::iprobe(source, tag, comm, flag, status); @@ -563,7 +612,7 @@ static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status) 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 (req->flags() & MPI_REQ_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()); @@ -585,10 +634,10 @@ 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::get_pid() : -1; // TODO: cheinrich: Check if this correct or if it should be MPI_UNDEFINED - TRACE_smpi_comm_in(my_proc_id, __FUNCTION__, new simgrid::instr::NoOpTIData("wait")); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("wait")); simgrid::smpi::Request::wait(request, status); retval = MPI_SUCCESS; @@ -612,8 +661,8 @@ 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? - TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::CpuTIData("waitAny", static_cast(count))); + int 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", static_cast(count))); *index = simgrid::smpi::Request::waitany(count, requests, status); @@ -630,8 +679,8 @@ 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? - TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::CpuTIData("waitAll", static_cast(count))); + int 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", static_cast(count))); int retval = simgrid::smpi::Request::waitall(count, requests, status); @@ -674,6 +723,30 @@ int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indic return retval; } +int PMPI_Cancel(MPI_Request* request) +{ + int retval = 0; + + smpi_bench_end(); + if (*request == MPI_REQUEST_NULL) { + retval = MPI_ERR_REQUEST; + } else { + (*request)->cancel(); + retval = MPI_SUCCESS; + } + smpi_bench_begin(); + return retval; +} + +int PMPI_Test_cancelled(MPI_Status* status, int* flag){ + if(status==MPI_STATUS_IGNORE){ + *flag=0; + return MPI_ERR_ARG; + } + *flag=simgrid::smpi::Status::cancelled(status); + return MPI_SUCCESS; +} + MPI_Request PMPI_Request_f2c(MPI_Fint request){ return static_cast(simgrid::smpi::Request::f2c(request)); } @@ -681,5 +754,3 @@ MPI_Request PMPI_Request_f2c(MPI_Fint request){ MPI_Fint PMPI_Request_c2f(MPI_Request request) { return request->c2f(); } - -}