X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..3f9b311ec56db95ec539001a860ae3c838c48312:/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 0c1f5b4073..0dc9e32f21 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. 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,81 +11,73 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); -static int getPid(MPI_Comm, int); -static int getPid(MPI_Comm comm, int id) +static aid_t getPid(MPI_Comm comm, int id) { - simgrid::s4u::ActorPtr actor = comm->group()->actor(id); - return (actor == nullptr) ? MPI_UNDEFINED : actor->get_pid(); -} - + return comm->group()->actor(id); +} + +#define CHECK_SEND_INPUTS\ + SET_BUF1(buf)\ + CHECK_COUNT(2, count)\ + CHECK_TYPE(3, datatype)\ + CHECK_BUFFER(1, buf, count, datatype)\ + CHECK_COMM(6)\ + if(dst!= MPI_PROC_NULL)\ + CHECK_RANK(4, dst, comm)\ + CHECK_TAG(5, tag) + +#define CHECK_ISEND_INPUTS\ + CHECK_REQUEST(7)\ + *request = MPI_REQUEST_NULL;\ + CHECK_SEND_INPUTS + +#define CHECK_IRECV_INPUTS\ + SET_BUF1(buf)\ + CHECK_REQUEST(7)\ + *request = MPI_REQUEST_NULL;\ + CHECK_COUNT(2, count)\ + CHECK_TYPE(3, datatype)\ + CHECK_BUFFER(1, buf, count, datatype)\ + CHECK_COMM(6)\ + if(src!=MPI_ANY_SOURCE && src!=MPI_PROC_NULL)\ + CHECK_RANK(4, src, comm)\ + CHECK_TAG(5, tag) /* PMPI User level calls */ int PMPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request * request) { - int retval = 0; + CHECK_ISEND_INPUTS - smpi_bench_end(); - if (request == nullptr) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if (dst == MPI_PROC_NULL) { - retval = MPI_SUCCESS; - } else { - *request = simgrid::smpi::Request::send_init(buf, count, datatype, dst, tag, comm); - retval = MPI_SUCCESS; - } - smpi_bench_begin(); - if (retval != MPI_SUCCESS && request != nullptr) - *request = MPI_REQUEST_NULL; - return retval; + const SmpiBenchGuard suspend_bench; + *request = simgrid::smpi::Request::send_init(buf, count, datatype, dst, tag, comm); + + return MPI_SUCCESS; } int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request * request) { - int retval = 0; + CHECK_IRECV_INPUTS - smpi_bench_end(); - if (request == nullptr) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if (src == MPI_PROC_NULL) { - retval = MPI_SUCCESS; - } else { - *request = simgrid::smpi::Request::recv_init(buf, count, datatype, src, tag, comm); - retval = MPI_SUCCESS; - } - smpi_bench_begin(); - if (retval != MPI_SUCCESS && request != nullptr) - *request = MPI_REQUEST_NULL; - return retval; + const SmpiBenchGuard suspend_bench; + *request = simgrid::smpi::Request::recv_init(buf, count, datatype, src, tag, comm); + return MPI_SUCCESS; +} + +int PMPI_Rsend_init(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, + MPI_Request* request) +{ + return PMPI_Send_init(buf, count, datatype, dst, tag, comm, request); } int PMPI_Ssend_init(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) { + CHECK_ISEND_INPUTS + int retval = 0; + const SmpiBenchGuard suspend_bench; + *request = simgrid::smpi::Request::ssend_init(buf, count, datatype, dst, tag, comm); + retval = MPI_SUCCESS; - smpi_bench_end(); - if (request == nullptr) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if (dst == MPI_PROC_NULL) { - retval = MPI_SUCCESS; - } else { - *request = simgrid::smpi::Request::ssend_init(buf, count, datatype, dst, tag, comm); - retval = MPI_SUCCESS; - } - smpi_bench_begin(); - if (retval != MPI_SUCCESS && request != nullptr) - *request = MPI_REQUEST_NULL; return retval; } @@ -98,16 +90,15 @@ int PMPI_Start(MPI_Request * request) { int retval = 0; - smpi_bench_end(); - if (request == nullptr || *request == MPI_REQUEST_NULL) { + const SmpiBenchGuard suspend_bench; + CHECK_REQUEST_VALID(1) + if ( *request == MPI_REQUEST_NULL) { retval = MPI_ERR_REQUEST; } else { MPI_Request req = *request; - int my_proc_id = (req->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; + aid_t 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(), + new simgrid::instr::Pt2PtTIData("Start", MPI_COMM_WORLD->group()->rank(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()); @@ -119,14 +110,13 @@ int PMPI_Start(MPI_Request * request) retval = MPI_SUCCESS; TRACE_smpi_comm_out(my_proc_id); } - smpi_bench_begin(); return retval; } int PMPI_Startall(int count, MPI_Request * requests) { int retval; - smpi_bench_end(); + const SmpiBenchGuard suspend_bench; if (requests == nullptr) { retval = MPI_ERR_ARG; } else { @@ -137,12 +127,11 @@ int PMPI_Startall(int count, MPI_Request * requests) } } if(retval != MPI_ERR_REQUEST) { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t 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]; + const simgrid::smpi::Request* 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()); } @@ -151,14 +140,13 @@ int PMPI_Startall(int count, MPI_Request * requests) if (not TRACE_smpi_view_internals()) for (int i = 0; i < count; i++) { - req = requests[i]; + const simgrid::smpi::Request* 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(); return retval; } @@ -166,151 +154,87 @@ int PMPI_Request_free(MPI_Request * request) { int retval = 0; - smpi_bench_end(); - if (*request == MPI_REQUEST_NULL) { - retval = MPI_ERR_ARG; - } else { + const SmpiBenchGuard suspend_bench; + if (*request != MPI_REQUEST_NULL) { + (*request)->mark_as_deleted(); simgrid::smpi::Request::unref(request); + *request = MPI_REQUEST_NULL; retval = MPI_SUCCESS; } - smpi_bench_begin(); return retval; } int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Request * request) { - int retval = 0; - - smpi_bench_end(); - - if (request == nullptr) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (src == MPI_PROC_NULL) { - *request = MPI_REQUEST_NULL; - retval = MPI_SUCCESS; - } else if (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0)){ - retval = MPI_ERR_RANK; - } else if ((count < 0) || (buf==nullptr && count > 0)) { - retval = MPI_ERR_COUNT; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if(tag<0 && tag != MPI_ANY_TAG){ - retval = MPI_ERR_TAG; - } else { - - 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_comm_out(my_proc_id); - } - - smpi_bench_begin(); - if (retval != MPI_SUCCESS && request != nullptr) - *request = MPI_REQUEST_NULL; - return retval; + CHECK_IRECV_INPUTS + + const SmpiBenchGuard suspend_bench; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("irecv", MPI_COMM_WORLD->group()->rank(getPid(comm, src)), + count, + tag, simgrid::smpi::Datatype::encode(datatype))); + *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm); + TRACE_smpi_comm_out(my_proc_id); + return MPI_SUCCESS; } int PMPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request * request) { - int retval = 0; - - smpi_bench_end(); - if (request == nullptr) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (dst == MPI_PROC_NULL) { - *request = MPI_REQUEST_NULL; - retval = MPI_SUCCESS; - } else if (dst >= comm->group()->size() || dst <0){ - retval = MPI_ERR_RANK; - } else if ((count < 0) || (buf==nullptr && count > 0)) { - retval = MPI_ERR_COUNT; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if(tag<0 && tag != MPI_ANY_TAG){ - retval = MPI_ERR_TAG; - } else { - 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))); + CHECK_ISEND_INPUTS - 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(my_proc_id); - } + const SmpiBenchGuard suspend_bench; + int retval = 0; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t trace_dst = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("isend", MPI_COMM_WORLD->group()->rank(trace_dst), + count, + 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_comm_out(my_proc_id); - smpi_bench_begin(); - if (retval != MPI_SUCCESS && request!=nullptr) - *request = MPI_REQUEST_NULL; return retval; } -int PMPI_Issend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) +int PMPI_Irsend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, + MPI_Request* request) { - int retval = 0; - - smpi_bench_end(); - if (request == nullptr) { - retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (dst == MPI_PROC_NULL) { - *request = MPI_REQUEST_NULL; - retval = MPI_SUCCESS; - } else if (dst >= comm->group()->size() || dst <0){ - retval = MPI_ERR_RANK; - } else if ((count < 0)|| (buf==nullptr && count > 0)) { - retval = MPI_ERR_COUNT; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if(tag<0 && tag != MPI_ANY_TAG){ - retval = MPI_ERR_TAG; - } else { - 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_comm_out(my_proc_id); - } + return PMPI_Isend(buf, count, datatype, dst, tag, comm, request); +} - smpi_bench_begin(); - if (retval != MPI_SUCCESS && request!=nullptr) - *request = MPI_REQUEST_NULL; - return retval; +int PMPI_Issend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) +{ + CHECK_ISEND_INPUTS + + const SmpiBenchGuard suspend_bench; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t trace_dst = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("ISsend", MPI_COMM_WORLD->group()->rank(trace_dst), + count, + 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); + TRACE_smpi_comm_out(my_proc_id); + return MPI_SUCCESS; } int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm, MPI_Status * status) { int retval = 0; - - smpi_bench_end(); - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (src == MPI_PROC_NULL) { + SET_BUF1(buf) + CHECK_COUNT(2, count) + CHECK_TYPE(3, datatype) + CHECK_BUFFER(1, buf, count, datatype) + CHECK_TAG(5, tag) + CHECK_COMM(6) + + const SmpiBenchGuard suspend_bench; + if (src == MPI_PROC_NULL) { if(status != MPI_STATUS_IGNORE){ simgrid::smpi::Status::empty(status); status->MPI_SOURCE = MPI_PROC_NULL; @@ -318,199 +242,303 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI retval = MPI_SUCCESS; } else if (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0)){ retval = MPI_ERR_RANK; - } else if ((count < 0) || (buf==nullptr && count > 0)) { - retval = MPI_ERR_COUNT; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if(tag<0 && tag != MPI_ANY_TAG){ - retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t 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(), + new simgrid::instr::Pt2PtTIData("recv", MPI_COMM_WORLD->group()->rank(getPid(comm, src)), + count, tag, simgrid::smpi::Datatype::encode(datatype))); - simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); - retval = MPI_SUCCESS; + retval = simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE) - 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()) { + aid_t src_traced = (status != MPI_STATUS_IGNORE) ? getPid(comm, status->MPI_SOURCE) : getPid(comm, src); TRACE_smpi_recv(src_traced, my_proc_id, tag); } - + TRACE_smpi_comm_out(my_proc_id); } - smpi_bench_begin(); return retval; } int PMPI_Send(const void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - int retval = 0; - - smpi_bench_end(); - - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (dst == MPI_PROC_NULL) { - retval = MPI_SUCCESS; - } else if (dst >= comm->group()->size() || dst <0){ - retval = MPI_ERR_RANK; - } else if ((count < 0) || (buf == nullptr && count > 0)) { - retval = MPI_ERR_COUNT; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if(tag < 0 && tag != MPI_ANY_TAG){ - retval = MPI_ERR_TAG; - } else { - 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(my_proc_id, my_proc_id, dst_traced, tag, count * datatype->size()); - } + CHECK_SEND_INPUTS + + const SmpiBenchGuard suspend_bench; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("send", MPI_COMM_WORLD->group()->rank(dst_traced), + count, + 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()); + } + simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm); + TRACE_smpi_comm_out(my_proc_id); + return MPI_SUCCESS; +} - simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm); - retval = MPI_SUCCESS; +int PMPI_Rsend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) +{ + return PMPI_Send(buf, count, datatype, dst, tag, comm); +} - TRACE_smpi_comm_out(my_proc_id); +int PMPI_Bsend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) +{ + CHECK_SEND_INPUTS + + const SmpiBenchGuard suspend_bench; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = getPid(comm, dst); + int bsend_buf_size = 0; + void* bsend_buf = nullptr; + smpi_process()->bsend_buffer(&bsend_buf, &bsend_buf_size); + if (bsend_buf == nullptr || bsend_buf_size < datatype->get_extent() * count + MPI_BSEND_OVERHEAD) + return MPI_ERR_BUFFER; + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("bsend", MPI_COMM_WORLD->group()->rank(dst_traced), + count, + 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()); } + simgrid::smpi::Request::bsend(buf, count, datatype, dst, tag, comm); + TRACE_smpi_comm_out(my_proc_id); + return MPI_SUCCESS; +} - smpi_bench_begin(); - return retval; +int PMPI_Ibsend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) +{ + CHECK_ISEND_INPUTS + + const SmpiBenchGuard suspend_bench; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t trace_dst = getPid(comm, dst); + int bsend_buf_size = 0; + void* bsend_buf = nullptr; + smpi_process()->bsend_buffer(&bsend_buf, &bsend_buf_size); + if (bsend_buf == nullptr || bsend_buf_size < datatype->get_extent() * count + MPI_BSEND_OVERHEAD) + return MPI_ERR_BUFFER; + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("ibsend", MPI_COMM_WORLD->group()->rank(trace_dst), + count, + 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::ibsend(buf, count, datatype, dst, tag, comm); + TRACE_smpi_comm_out(my_proc_id); + return MPI_SUCCESS; } -int PMPI_Ssend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { +int PMPI_Bsend_init(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm, MPI_Request* request) +{ + CHECK_ISEND_INPUTS + + const SmpiBenchGuard suspend_bench; int retval = 0; + int bsend_buf_size = 0; + void* bsend_buf = nullptr; + smpi_process()->bsend_buffer(&bsend_buf, &bsend_buf_size); + if( bsend_buf==nullptr || bsend_buf_size < datatype->get_extent() * count + MPI_BSEND_OVERHEAD ) { + retval = MPI_ERR_BUFFER; + } else { + *request = simgrid::smpi::Request::bsend_init(buf, count, datatype, dst, tag, comm); + retval = MPI_SUCCESS; + } + return retval; +} - smpi_bench_end(); +int PMPI_Ssend(const void* buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) +{ + CHECK_SEND_INPUTS + + const SmpiBenchGuard suspend_bench; + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = getPid(comm, dst); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("Ssend", MPI_COMM_WORLD->group()->rank(dst_traced), + count, + 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); + TRACE_smpi_comm_out(my_proc_id); + return MPI_SUCCESS; +} - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (dst == MPI_PROC_NULL) { +int PMPI_Sendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf, + int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status* status) +{ + int retval = 0; + SET_BUF1(sendbuf) + SET_BUF2(recvbuf) + CHECK_COUNT(2, sendcount) + CHECK_TYPE(3, sendtype) + CHECK_TAG(5, sendtag) + CHECK_COUNT(7, recvcount) + CHECK_TYPE(8, recvtype) + CHECK_BUFFER(1, sendbuf, sendcount, sendtype) + CHECK_BUFFER(6, recvbuf, recvcount, recvtype) + CHECK_ARGS(sendbuf == recvbuf && sendcount > 0 && recvcount > 0, MPI_ERR_BUFFER, + "%s: Invalid parameters 1 and 6: sendbuf and recvbuf must be disjoint", __func__) + CHECK_TAG(10, recvtag) + CHECK_COMM(11) + const SmpiBenchGuard suspend_bench; + + 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 >= comm->group()->size() || dst <0){ + } else if (dst == MPI_PROC_NULL){ + retval = simgrid::smpi::Request::recv(recvbuf, recvcount, recvtype, src, recvtag, comm, status); + } else if (dst >= comm->group()->size() || dst <0 || + (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0))){ retval = MPI_ERR_RANK; - } else if ((count < 0) || (buf==nullptr && count > 0)) { - retval = MPI_ERR_COUNT; - } else if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - retval = MPI_ERR_TYPE; - } else if(tag<0 && tag != MPI_ANY_TAG){ - retval = MPI_ERR_TAG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); - int dst_traced = getPid(comm, dst); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = MPI_COMM_WORLD->group()->rank(getPid(comm, dst)); + aid_t src_traced = MPI_COMM_WORLD->group()->rank(getPid(comm, src)); + + // FIXME: Hack the way to trace this one + auto dst_hack = std::make_shared>(); + auto src_hack = std::make_shared>(); + dst_hack->push_back(dst_traced); + src_hack->push_back(src_traced); 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()); + new simgrid::instr::VarCollTIData( + "sendRecv", -1, sendcount, + dst_hack, recvcount, 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::ssend(buf, count, datatype, dst, tag, comm); + simgrid::smpi::Request::sendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, + recvtag, comm, status); retval = MPI_SUCCESS; + TRACE_smpi_recv(src_traced, my_proc_id, recvtag); TRACE_smpi_comm_out(my_proc_id); } - smpi_bench_begin(); return retval; } -int PMPI_Sendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf, - int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Status* status) +int PMPI_Isendrecv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, int dst, int sendtag, void* recvbuf, + int recvcount, MPI_Datatype recvtype, int src, int recvtag, MPI_Comm comm, MPI_Request* request) { int retval = 0; - - smpi_bench_end(); - - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (not sendtype->is_valid() || not recvtype->is_valid()) { - retval = MPI_ERR_TYPE; - } 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); + SET_BUF1(sendbuf) + SET_BUF2(recvbuf) + CHECK_COUNT(2, sendcount) + CHECK_TYPE(3, sendtype) + CHECK_TAG(5, sendtag) + CHECK_COUNT(7, recvcount) + CHECK_TYPE(8, recvtype) + CHECK_BUFFER(1, sendbuf, sendcount, sendtype) + CHECK_BUFFER(6, recvbuf, recvcount, recvtype) + CHECK_ARGS(sendbuf == recvbuf && sendcount > 0 && recvcount > 0, MPI_ERR_BUFFER, + "%s: Invalid parameters 1 and 6: sendbuf and recvbuf must be disjoint", __func__) + CHECK_TAG(10, recvtag) + CHECK_COMM(11) + CHECK_REQUEST(12) + *request = MPI_REQUEST_NULL; + const SmpiBenchGuard suspend_bench; + + if (src == MPI_PROC_NULL && dst != MPI_PROC_NULL){ + *request=simgrid::smpi::Request::isend(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); + } else if (dst == MPI_PROC_NULL){ + *request = simgrid::smpi::Request::irecv(recvbuf, recvcount, recvtype, src, recvtag, comm); retval = MPI_SUCCESS; - }else if (dst >= comm->group()->size() || dst <0 || + } else if (dst >= comm->group()->size() || dst <0 || (src!=MPI_ANY_SOURCE && (src >= comm->group()->size() || src <0))){ retval = MPI_ERR_RANK; - } else if ((sendcount < 0 || recvcount<0) || - (sendbuf==nullptr && sendcount > 0) || (recvbuf==nullptr && recvcount>0)) { - retval = MPI_ERR_COUNT; - } 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::get_pid(); - int dst_traced = getPid(comm, dst); - int src_traced = getPid(comm, src); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t dst_traced = MPI_COMM_WORLD->group()->rank(getPid(comm, dst)); + aid_t src_traced = MPI_COMM_WORLD->group()->rank(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; + auto dst_hack = std::make_shared>(); + auto src_hack = std::make_shared>(); 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, + "isendRecv", -1, sendcount, + dst_hack, recvcount, 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); + simgrid::smpi::Request::isendrecv(sendbuf, sendcount, sendtype, dst, sendtag, recvbuf, recvcount, recvtype, src, + recvtag, comm, request); retval = MPI_SUCCESS; TRACE_smpi_recv(src_traced, my_proc_id, recvtag); TRACE_smpi_comm_out(my_proc_id); } - smpi_bench_begin(); return retval; } + int PMPI_Sendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag, MPI_Comm comm, MPI_Status* status) { int retval = 0; - if (datatype==MPI_DATATYPE_NULL || not datatype->is_valid()) { - return MPI_ERR_TYPE; - } else if (count < 0) { - return MPI_ERR_COUNT; - } else { - int size = datatype->get_extent() * count; - void* recvbuf = xbt_new0(char, size); - retval = MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf, count, datatype, src, recvtag, comm, status); - if(retval==MPI_SUCCESS){ - simgrid::smpi::Datatype::copy(recvbuf, count, datatype, buf, count, datatype); - } - xbt_free(recvbuf); + SET_BUF1(buf) + CHECK_COUNT(2, count) + CHECK_TYPE(3, datatype) + CHECK_BUFFER(1, buf, count, datatype) + int size = datatype->get_extent() * count; + if (size == 0) + return MPI_SUCCESS; + else if (size <0) + return MPI_ERR_ARG; + std::vector recvbuf(size); + retval = + MPI_Sendrecv(buf, count, datatype, dst, sendtag, recvbuf.data(), count, datatype, src, recvtag, comm, status); + if(retval==MPI_SUCCESS){ + simgrid::smpi::Datatype::copy(recvbuf.data(), count, datatype, buf, count, datatype); } return retval; } +int PMPI_Isendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, int sendtag, int src, int recvtag, + MPI_Comm comm, MPI_Request* request) +{ + int retval = 0; + SET_BUF1(buf) + CHECK_COUNT(2, count) + CHECK_TYPE(3, datatype) + CHECK_BUFFER(1, buf, count, datatype) + CHECK_REQUEST(10) + *request = MPI_REQUEST_NULL; + + int size = datatype->get_extent() * count; + if (size == 0) + return MPI_SUCCESS; + else if (size <0) + return MPI_ERR_ARG; + std::vector sendbuf(size); + simgrid::smpi::Datatype::copy(buf, count, datatype, sendbuf.data(), count, datatype); + retval = + MPI_Isendrecv(sendbuf.data(), count, datatype, dst, sendtag, buf, count, datatype, src, recvtag, comm, request); + return retval; +} + int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) { int retval = 0; - smpi_bench_end(); + const SmpiBenchGuard suspend_bench; if (request == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else if (*request == MPI_REQUEST_NULL) { @@ -520,76 +548,76 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status) } retval = MPI_SUCCESS; } else { - int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1; + aid_t 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")); - + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::WaitTIData("test", MPI_COMM_WORLD->group()->rank((*request)->src()), + MPI_COMM_WORLD->group()->rank((*request)->dst()), + (*request)->tag())); retval = simgrid::smpi::Request::test(request,status, flag); TRACE_smpi_comm_out(my_proc_id); } - smpi_bench_begin(); return retval; } int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_Status * status) { int retval = 0; - - smpi_bench_end(); + CHECK_COUNT(1, count) + const SmpiBenchGuard suspend_bench; if (index == nullptr || flag == nullptr) { retval = MPI_ERR_ARG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testany")); retval = simgrid::smpi::Request::testany(count, requests, index, flag, status); TRACE_smpi_comm_out(my_proc_id); } - smpi_bench_begin(); return retval; } int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* statuses) { int retval = 0; - - smpi_bench_end(); + CHECK_COUNT(1, count) + const SmpiBenchGuard suspend_bench; if (flag == nullptr) { retval = MPI_ERR_ARG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testall")); retval = simgrid::smpi::Request::testall(count, requests, flag, statuses); TRACE_smpi_comm_out(my_proc_id); } - 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(); + CHECK_COUNT(1, incount) + const SmpiBenchGuard suspend_bench; if (outcount == nullptr) { retval = MPI_ERR_ARG; } else { - int my_proc_id = simgrid::s4u::this_actor::get_pid(); + aid_t my_proc_id = simgrid::s4u::this_actor::get_pid(); TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testsome")); retval = simgrid::smpi::Request::testsome(incount, requests, outcount, indices, status); TRACE_smpi_comm_out(my_proc_id); } - smpi_bench_begin(); return retval; } int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { int retval = 0; - smpi_bench_end(); + const SmpiBenchGuard suspend_bench; - if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; - } else if (source == MPI_PROC_NULL) { + CHECK_COMM(6) + if(source!=MPI_ANY_SOURCE && source!=MPI_PROC_NULL)\ + CHECK_RANK(1, source, comm) + CHECK_TAG(2, tag) + if (source == MPI_PROC_NULL) { if (status != MPI_STATUS_IGNORE){ simgrid::smpi::Status::empty(status); status->MPI_SOURCE = MPI_PROC_NULL; @@ -599,18 +627,18 @@ int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) { simgrid::smpi::Request::probe(source, tag, comm, status); retval = MPI_SUCCESS; } - smpi_bench_begin(); return retval; } int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* status) { int retval = 0; - smpi_bench_end(); - + const SmpiBenchGuard suspend_bench; + CHECK_COMM(6) + if(source!=MPI_ANY_SOURCE && source!=MPI_PROC_NULL)\ + CHECK_RANK(1, source, comm) + CHECK_TAG(2, tag) if (flag == nullptr) { retval = MPI_ERR_ARG; - } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; } else if (source == MPI_PROC_NULL) { *flag=true; if (status != MPI_STATUS_IGNORE){ @@ -622,24 +650,20 @@ int PMPI_Iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* statu simgrid::smpi::Request::iprobe(source, tag, comm, flag, status); retval = MPI_SUCCESS; } - smpi_bench_begin(); 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) +static void trace_smpi_wait_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(); + const simgrid::smpi::Request* req = *request; + // Requests already received are null. Is this request a wait for RECV? + if (req != MPI_REQUEST_NULL && (req->flags() & MPI_REQ_RECV)) { + aid_t src_traced = req->src(); + aid_t dst_traced = req->dst(); // 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()); - } + if (src_traced == MPI_ANY_SOURCE && status != MPI_STATUS_IGNORE) + src_traced = req->comm()->group()->actor(status->MPI_SOURCE); + TRACE_smpi_recv(src_traced, dst_traced, req->tag()); } } @@ -647,39 +671,36 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) { int retval = 0; - smpi_bench_end(); + const SmpiBenchGuard suspend_bench; simgrid::smpi::Status::empty(status); - if (request == nullptr) { - retval = MPI_ERR_ARG; - } else if (*request == MPI_REQUEST_NULL) { + CHECK_NULL(1, MPI_ERR_ARG, request) + 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 + // for tracing, save the handle which might get overridden before we can use the helper on it MPI_Request savedreq = *request; - if (savedreq != MPI_REQUEST_NULL && not(savedreq->flags() & MPI_REQ_FINISHED) - && not(savedreq->flags() & MPI_REQ_GENERALIZED)) - savedreq->ref();//don't erase te handle in Request::wait, we'll need it later + if (not(savedreq->flags() & (MPI_REQ_FINISHED | MPI_REQ_GENERALIZED | MPI_REQ_NBC))) + savedreq->ref();//don't erase the 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 + aid_t 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::WaitTIData((*request)->src(), (*request)->dst(), (*request)->tag())); + new simgrid::instr::WaitTIData("wait", MPI_COMM_WORLD->group()->rank((*request)->src()), + MPI_COMM_WORLD->group()->rank((*request)->dst()), + (*request)->tag())); retval = simgrid::smpi::Request::wait(request, 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(&savedreq, status); + trace_smpi_wait_recv_helper(&savedreq, status); if (savedreq != MPI_REQUEST_NULL) simgrid::smpi::Request::unref(&savedreq); } - smpi_bench_begin(); return retval; } @@ -691,23 +712,23 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta if (count <= 0) return MPI_SUCCESS; - smpi_bench_end(); - //for tracing, save the handles which might get overriden before we can use the helper on it + const SmpiBenchGuard suspend_bench; + // for tracing, save the handles which might get overridden 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)) + if (req != MPI_REQUEST_NULL && not(req->flags() & (MPI_REQ_FINISHED | MPI_REQ_NBC))) 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("waitAny", static_cast(count))); + aid_t 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", count)); *index = simgrid::smpi::Request::waitany(count, requests, status); if(*index!=MPI_UNDEFINED){ - trace_smpi_recv_helper(&savedreqs[*index], status); + trace_smpi_wait_recv_helper(&savedreqs[*index], status); TRACE_smpi_comm_out(rank_traced); } @@ -715,30 +736,29 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta if (req != MPI_REQUEST_NULL) simgrid::smpi::Request::unref(&req); - smpi_bench_begin(); return MPI_SUCCESS; } int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) { - smpi_bench_end(); - - //for tracing, save the handles which might get overriden before we can use the helper on it + const SmpiBenchGuard suspend_bench; + CHECK_COUNT(1, count) + // for tracing, save the handles which might get overridden 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)) + if (req != MPI_REQUEST_NULL && not(req->flags() & (MPI_REQ_FINISHED | MPI_REQ_NBC))) 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))); + aid_t 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", count)); int retval = simgrid::smpi::Request::waitall(count, requests, status); for (int i = 0; i < count; i++) { - trace_smpi_recv_helper(&savedreqs[i], status!=MPI_STATUSES_IGNORE ? &status[i]: MPI_STATUS_IGNORE); + trace_smpi_wait_recv_helper(&savedreqs[i], status != MPI_STATUSES_IGNORE ? &status[i] : MPI_STATUS_IGNORE); } TRACE_smpi_comm_out(rank_traced); @@ -746,22 +766,20 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) if (req != MPI_REQUEST_NULL) simgrid::smpi::Request::unref(&req); - smpi_bench_begin(); return retval; } int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int *indices, MPI_Status status[]) { int retval = 0; - - smpi_bench_end(); + CHECK_COUNT(1, incount) + const SmpiBenchGuard suspend_bench; if (outcount == nullptr) { retval = MPI_ERR_ARG; } else { *outcount = simgrid::smpi::Request::waitsome(incount, requests, indices, status); retval = MPI_SUCCESS; } - smpi_bench_begin(); return retval; } @@ -769,14 +787,14 @@ int PMPI_Cancel(MPI_Request* request) { int retval = 0; - smpi_bench_end(); + const SmpiBenchGuard suspend_bench; + CHECK_REQUEST_VALID(1) if (*request == MPI_REQUEST_NULL) { retval = MPI_ERR_REQUEST; } else { (*request)->cancel(); retval = MPI_SUCCESS; } - smpi_bench_begin(); return retval; } @@ -786,7 +804,7 @@ int PMPI_Test_cancelled(const MPI_Status* status, int* flag){ return MPI_ERR_ARG; } *flag=simgrid::smpi::Status::cancelled(status); - return MPI_SUCCESS; + return MPI_SUCCESS; } int PMPI_Status_set_cancelled(MPI_Status* status, int flag){ @@ -794,7 +812,7 @@ int PMPI_Status_set_cancelled(MPI_Status* status, int flag){ return MPI_ERR_ARG; } simgrid::smpi::Status::set_cancelled(status,flag); - return MPI_SUCCESS; + return MPI_SUCCESS; } int PMPI_Status_set_elements(MPI_Status* status, MPI_Datatype datatype, int count){ @@ -802,7 +820,15 @@ int PMPI_Status_set_elements(MPI_Status* status, MPI_Datatype datatype, int coun return MPI_ERR_ARG; } simgrid::smpi::Status::set_elements(status,datatype, count); - return MPI_SUCCESS; + return MPI_SUCCESS; +} + +int PMPI_Status_set_elements_x(MPI_Status* status, MPI_Datatype datatype, MPI_Count count){ + if(status==MPI_STATUS_IGNORE){ + return MPI_ERR_ARG; + } + simgrid::smpi::Status::set_elements(status,datatype, static_cast(count)); + return MPI_SUCCESS; } int PMPI_Grequest_start( MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, void *extra_state, MPI_Request *request){ @@ -813,22 +839,25 @@ int PMPI_Grequest_complete( MPI_Request request){ return simgrid::smpi::Request::grequest_complete(request); } - int PMPI_Request_get_status( MPI_Request request, int *flag, MPI_Status *status){ if(request==MPI_REQUEST_NULL){ *flag=1; simgrid::smpi::Status::empty(status); - return MPI_ERR_REQUEST; - } else if (flag==NULL || status ==NULL){ + return MPI_SUCCESS; + } else if (flag == nullptr) { return MPI_ERR_ARG; } return simgrid::smpi::Request::get_status(request,flag,status); } MPI_Request PMPI_Request_f2c(MPI_Fint request){ - return static_cast(simgrid::smpi::Request::f2c(request)); + if(request==-1) + return MPI_REQUEST_NULL; + return simgrid::smpi::Request::f2c(request); } MPI_Fint PMPI_Request_c2f(MPI_Request request) { + if(request==MPI_REQUEST_NULL) + return -1; return request->c2f(); }