X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1960663a2867517c7e697436c6b49185faf2422c..c3667a869f5252151ec3142010ffb7ac36ceaeca:/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 c47791c0e6..b2192d9055 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -89,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; @@ -97,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; @@ -118,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(); @@ -163,7 +200,7 @@ 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::this_actor::getPid(); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Irecv", src, @@ -204,7 +241,7 @@ 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::this_actor::getPid(); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); int trace_dst = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Isend", dst, @@ -246,7 +283,7 @@ 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::this_actor::getPid(); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); int trace_dst = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("ISsend", dst, @@ -274,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; @@ -286,7 +325,7 @@ 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::this_actor::getPid(); + 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(), @@ -296,12 +335,15 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI retval = MPI_SUCCESS; // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - if (status != MPI_STATUS_IGNORE) { - int src_traced = getPid(comm, status->MPI_SOURCE); - if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(src_traced, my_proc_id, tag); - } + 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()) { + TRACE_smpi_recv(src_traced, my_proc_id, tag); } + TRACE_smpi_comm_out(my_proc_id); } @@ -328,7 +370,7 @@ 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::this_actor::getPid(); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); int dst_traced = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("send", dst, @@ -366,7 +408,7 @@ 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::this_actor::getPid(); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); int dst_traced = getPid(comm, dst); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::Pt2PtTIData("Ssend", dst, @@ -415,7 +457,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::this_actor::getPid(); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); int dst_traced = getPid(comm, dst); int src_traced = getPid(comm, src); @@ -472,11 +514,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::this_actor::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); @@ -523,13 +567,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); @@ -549,8 +593,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); @@ -569,9 +615,9 @@ 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(); + src_traced = (status != MPI_STATUS_IGNORE) ? req->comm()->group()->rank(status->MPI_SOURCE) : req->src(); TRACE_smpi_recv(src_traced, dst_traced, req->tag()); } } @@ -590,10 +636,16 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) } else if (*request == MPI_REQUEST_NULL) { retval = MPI_SUCCESS; } else { + //for tracing, save the handle which might get overriden before we can use the helper on it + MPI_Request savedreq = *request; + if (savedreq != MPI_REQUEST_NULL && not(savedreq->flags() & MPI_REQ_FINISHED)) + savedreq->ref();//don't erase te handle in Request::wait, we'll need it later + else + savedreq = MPI_REQUEST_NULL; + int my_proc_id = (*request)->comm() != MPI_COMM_NULL - ? simgrid::s4u::this_actor::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, __func__, new simgrid::instr::NoOpTIData("wait")); simgrid::smpi::Request::wait(request, status); @@ -601,7 +653,9 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) //the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) TRACE_smpi_comm_out(my_proc_id); - trace_smpi_recv_helper(request, status); + trace_smpi_recv_helper(&savedreq, status); + if (savedreq != MPI_REQUEST_NULL) + simgrid::smpi::Request::unref(&savedreq); } smpi_bench_begin(); @@ -617,17 +671,29 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta return MPI_SUCCESS; smpi_bench_end(); + //for tracing, save the handles which might get overriden before we can use the helper on it + std::vector savedreqs(requests, requests + count); + for (MPI_Request& req : savedreqs) { + if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED)) + req->ref(); + else + req = MPI_REQUEST_NULL; + } - int rank_traced = simgrid::s4u::this_actor::getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? + 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); if(*index!=MPI_UNDEFINED){ - trace_smpi_recv_helper(&requests[*index], status); + trace_smpi_recv_helper(&savedreqs[*index], status); TRACE_smpi_comm_out(rank_traced); } + for (MPI_Request& req : savedreqs) + if (req != MPI_REQUEST_NULL) + simgrid::smpi::Request::unref(&req); + smpi_bench_begin(); return MPI_SUCCESS; } @@ -636,16 +702,29 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { smpi_bench_end(); - int rank_traced = simgrid::s4u::this_actor::getPid(); // FIXME: In PMPI_Wait, we check if the comm is null? + //for tracing, save the handles which might get overriden before we can use the helper on it + std::vector savedreqs(requests, requests + count); + for (MPI_Request& req : savedreqs) { + if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED)) + req->ref(); + else + req = MPI_REQUEST_NULL; + } + + 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); for (int i = 0; i < count; i++) { - trace_smpi_recv_helper(&requests[i], &status[i]); + trace_smpi_recv_helper(&savedreqs[i], status!=MPI_STATUSES_IGNORE ? &status[i]: MPI_STATUS_IGNORE); } TRACE_smpi_comm_out(rank_traced); + for (MPI_Request& req : savedreqs) + if (req != MPI_REQUEST_NULL) + simgrid::smpi::Request::unref(&req); + smpi_bench_begin(); return retval; } @@ -680,6 +759,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)); }