X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1fc042e8bc9c51f9267fa1936deaebe59ae01ee7..dabc974c900a0e86479655752a6c915385d670e7:/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 ac91c2d200..19e2f997a3 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,8 +11,14 @@ 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->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) { @@ -83,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; @@ -91,8 +102,22 @@ int PMPI_Start(MPI_Request * request) if (request == nullptr || *request == MPI_REQUEST_NULL) { retval = MPI_ERR_REQUEST; } else { - (*request)->start(); - retval = MPI_SUCCESS; + 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; @@ -112,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(); @@ -157,25 +200,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 src_traced = comm->group()->index(src); - - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_IRECV; - extra->src = src_traced; - extra->dst = rank; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = datatype->size(); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("Irecv", src, + datatype->is_replayable() ? count : count * datatype->size(), + tag, simgrid::smpi::Datatype::encode(datatype))); *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -206,25 +241,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 dst_traced = comm->group()->index(dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ISEND; - extra->src = rank; - extra->dst = dst_traced; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = datatype->size(); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); + 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, + datatype->is_replayable() ? count : count * datatype->size(), + 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::isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -254,25 +283,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 dst_traced = comm->group()->index(dst); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_ISSEND; - extra->src = rank; - extra->dst = dst_traced; - int known=0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known==0) - dt_size_send = datatype->size(); - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); + 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, + datatype->is_replayable() ? count : count * datatype->size(), + 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); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -289,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; @@ -301,31 +325,26 @@ 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); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); - extra->type = TRACING_RECV; - extra->src = src_traced; - extra->dst = rank; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = datatype->size(); - extra->send_size = count * dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + 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(), + tag, simgrid::smpi::Datatype::encode(datatype))); simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); retval = MPI_SUCCESS; // 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); - if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(src_traced, rank, 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_ptp_out(rank, rank, __FUNCTION__); + + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -351,28 +370,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); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SEND; - extra->src = rank; - extra->dst = dst_traced; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if (known == 0) { - dt_size_send = datatype->size(); - } - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + 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, + datatype->is_replayable() ? count : count * datatype->size(), + tag, simgrid::smpi::Datatype::encode(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_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -397,26 +408,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); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_SSEND; - extra->src = rank; - extra->dst = dst_traced; - int known = 0; - extra->datatype1 = encode_datatype(datatype, &known); - int dt_size_send = 1; - if(known == 0) { - dt_size_send = datatype->size(); - } - extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size()); + 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, + datatype->is_replayable() ? count : count * datatype->size(), + 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); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -434,10 +437,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; @@ -447,35 +457,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); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t, 1); - extra->type = TRACING_SENDRECV; - extra->src = src_traced; - extra->dst = dst_traced; - int known = 0; - extra->datatype1 = encode_datatype(sendtype, &known); - int dt_size_send = 1; - if (known == 0) - dt_size_send = sendtype->size(); - extra->send_size = sendcount * dt_size_send; - extra->datatype2 = encode_datatype(recvtype, &known); - int dt_size_recv = 1; - if (known == 0) - dt_size_recv = recvtype->size(); - extra->recv_size = recvcount * dt_size_recv; - - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, dst_traced, sendtag, sendcount * sendtype->size()); + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + int dst_traced = getPid(comm, dst); + int src_traced = getPid(comm, 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(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, + 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()); simgrid::smpi::Request::sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, recvtag, comm, status); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); - TRACE_smpi_recv(src_traced, rank, recvtag); + TRACE_smpi_recv(src_traced, my_proc_id, recvtag); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); @@ -510,19 +514,19 @@ 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 rank = ((*request)->comm() != MPI_COMM_NULL) ? smpi_process()->index() : -1; - - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_TEST; - TRACE_smpi_testing_in(rank, extra); + int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test")); + *flag = simgrid::smpi::Request::test(request,status); - TRACE_smpi_testing_out(rank); + TRACE_smpi_comm_out(my_proc_id); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -537,7 +541,10 @@ int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_S if (index == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else { + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testany")); *flag = simgrid::smpi::Request::testany(count, requests, index, status); + TRACE_smpi_comm_out(my_proc_id); retval = MPI_SUCCESS; } smpi_bench_begin(); @@ -552,24 +559,45 @@ int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* status if (flag == nullptr) { retval = MPI_ERR_ARG; } else { + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testall")); *flag = simgrid::smpi::Request::testall(count, requests, statuses); + TRACE_smpi_comm_out(my_proc_id); retval = MPI_SUCCESS; } smpi_bench_begin(); return retval; } +int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) +{ + int retval = 0; + + smpi_bench_end(); + if (outcount == nullptr) { + retval = MPI_ERR_ARG; + } else { + int my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testsome")); + *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status); + TRACE_smpi_comm_out(my_proc_id); + retval = MPI_SUCCESS; + } + smpi_bench_begin(); + return retval; +} + 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); @@ -589,8 +617,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); @@ -600,6 +630,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() & MPI_REQ_RECV) { // Is this request a wait for RECV? + if (src_traced == MPI_ANY_SOURCE) + src_traced = (status != MPI_STATUS_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; @@ -613,27 +660,27 @@ 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 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); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_WAIT; - TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); + //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::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::WaitTIData((*request)->src(), (*request)->dst(), (*request)->tag())); 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_ptp_out(rank, dst_traced, __FUNCTION__); - 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(&savedreq, status); + if (savedreq != MPI_REQUEST_NULL) + simgrid::smpi::Request::unref(&savedreq); } smpi_bench_begin(); @@ -649,44 +696,28 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta return MPI_SUCCESS; smpi_bench_end(); - //save requests information for tracing - typedef struct { - int src; - int dst; - int recv; - int tag; - MPI_Comm comm; - } savedvalstype; - 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()}; - } + //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 = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_WAITANY; - extra->send_size=count; - TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); + + 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){ - 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_ptp_out(rank_traced, dst_traced, __FUNCTION__); + trace_smpi_recv_helper(&savedreqs[*index], status); + TRACE_smpi_comm_out(rank_traced); } - xbt_free(savedvals); + + for (MPI_Request& req : savedreqs) + if (req != MPI_REQUEST_NULL) + simgrid::smpi::Request::unref(&req); smpi_bench_begin(); return MPI_SUCCESS; @@ -695,49 +726,29 @@ 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 - typedef struct { - int src; - int dst; - int recv; - int tag; - int valid; - MPI_Comm comm; - } savedvalstype; - 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; - } + //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 = smpi_process()->index(); - instr_extra_data extra = xbt_new0(s_instr_extra_data_t,1); - extra->type = TRACING_WAITALL; - extra->send_size=count; - TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); + + 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++) { - 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(&savedreqs[i], status!=MPI_STATUSES_IGNORE ? &status[i]: MPI_STATUS_IGNORE); } - TRACE_smpi_ptp_out(rank_traced, -1, __FUNCTION__); - xbt_free(savedvals); + 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; @@ -758,21 +769,30 @@ int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int *indic return retval; } -int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[]) +int PMPI_Cancel(MPI_Request* request) { int retval = 0; smpi_bench_end(); - if (outcount == nullptr) { - retval = MPI_ERR_ARG; + if (*request == MPI_REQUEST_NULL) { + retval = MPI_ERR_REQUEST; } else { - *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status); - retval = MPI_SUCCESS; + (*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)); } @@ -780,5 +800,3 @@ MPI_Request PMPI_Request_f2c(MPI_Fint request){ MPI_Fint PMPI_Request_c2f(MPI_Request request) { return request->c2f(); } - -}