X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5fec1387eeba572795dbc12a341f8350325abc9..0d5640fee91ae4ca8aa5e61fbf65ff726e7822d2:/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 71cdf1b616..c8ef0ec622 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -20,16 +20,16 @@ int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag smpi_bench_end(); if (request == nullptr) { - retval = MPI_ERR_ARG; + retval = MPI_ERR_ARG; } else if (comm == MPI_COMM_NULL) { - retval = MPI_ERR_COMM; + retval = MPI_ERR_COMM; } else if (not datatype->is_valid()) { retval = MPI_ERR_TYPE; } else if (dst == MPI_PROC_NULL) { - retval = MPI_SUCCESS; + retval = MPI_SUCCESS; } else { - *request = simgrid::smpi::Request::send_init(buf, count, datatype, dst, tag, comm); - retval = MPI_SUCCESS; + *request = simgrid::smpi::Request::send_init(buf, count, datatype, dst, tag, comm); + retval = MPI_SUCCESS; } smpi_bench_begin(); if (retval != MPI_SUCCESS && request != nullptr) @@ -170,12 +170,12 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MP if(known==0) dt_size_send = datatype->size(); extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); + TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); *request = simgrid::smpi::Request::irecv(buf, count, datatype, src, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); + TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); } smpi_bench_begin(); @@ -218,13 +218,13 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MP if(known==0) dt_size_send = datatype->size(); extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); *request = simgrid::smpi::Request::isend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); } smpi_bench_begin(); @@ -266,13 +266,13 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M if(known==0) dt_size_send = datatype->size(); extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced, tag, count*datatype->size()); *request = simgrid::smpi::Request::issend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); } smpi_bench_begin(); @@ -313,7 +313,7 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI if (known == 0) dt_size_send = datatype->size(); extra->send_size = count * dt_size_send; - TRACE_smpi_ptp_in(rank, src_traced, rank, __FUNCTION__, extra); + TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); simgrid::smpi::Request::recv(buf, count, datatype, src, tag, comm, status); retval = MPI_SUCCESS; @@ -322,10 +322,10 @@ int PMPI_Recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI if (status != MPI_STATUS_IGNORE) { src_traced = comm->group()->index(status->MPI_SOURCE); if (not TRACE_smpi_view_internals()) { - TRACE_smpi_recv(rank, src_traced, rank, tag); + TRACE_smpi_recv(src_traced, rank, tag); } } - TRACE_smpi_ptp_out(rank, src_traced, rank, __FUNCTION__); + TRACE_smpi_ptp_out(rank, rank, __FUNCTION__); } smpi_bench_begin(); @@ -364,7 +364,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI dt_size_send = datatype->size(); } extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); if (not TRACE_smpi_view_internals()) { TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size()); } @@ -372,7 +372,7 @@ int PMPI_Send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI simgrid::smpi::Request::send(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); } smpi_bench_begin(); @@ -410,21 +410,21 @@ int PMPI_Ssend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, MP dt_size_send = datatype->size(); } extra->send_size = count*dt_size_send; - TRACE_smpi_ptp_in(rank, rank, dst_traced, __FUNCTION__, extra); + TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); TRACE_smpi_send(rank, rank, dst_traced, tag,count*datatype->size()); simgrid::smpi::Request::ssend(buf, count, datatype, dst, tag, comm); retval = MPI_SUCCESS; - TRACE_smpi_ptp_out(rank, rank, dst_traced, __FUNCTION__); + TRACE_smpi_ptp_out(rank, dst_traced, __FUNCTION__); } smpi_bench_begin(); return retval; } -int PMPI_Sendrecv(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_Sendrecv(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; @@ -448,34 +448,34 @@ int PMPI_Sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype, int dst, retval = MPI_ERR_TAG; } else { - int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; - 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, src_traced, dst_traced, __FUNCTION__, extra); - TRACE_smpi_send(rank, rank, 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, src_traced, dst_traced, __FUNCTION__); - TRACE_smpi_recv(rank, src_traced, rank, recvtag); + int rank = comm != MPI_COMM_NULL ? smpi_process()->index() : -1; + 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()); + + 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); } smpi_bench_begin(); @@ -495,7 +495,7 @@ int PMPI_Sendrecv_replace(void* buf, int count, MPI_Datatype datatype, int dst, 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); + simgrid::smpi::Datatype::copy(recvbuf, count, datatype, buf, count, datatype); } xbt_free(recvbuf); @@ -623,19 +623,17 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status) 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, src_traced, dst_traced, __FUNCTION__, extra); + TRACE_smpi_ptp_in(rank, __FUNCTION__, extra); 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, src_traced, dst_traced, __FUNCTION__); + 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(rank, src_traced, dst_traced, tag_traced); + src_traced = (status != MPI_STATUS_IGNORE) ? comm->group()->rank(status->MPI_SOURCE) : src_traced; + TRACE_smpi_recv(src_traced, dst_traced, tag_traced); } } @@ -647,6 +645,9 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta { if (index == nullptr) return MPI_ERR_ARG; + + if (count <= 0) + return MPI_SUCCESS; smpi_bench_end(); //save requests information for tracing @@ -658,9 +659,9 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta MPI_Comm comm; } savedvalstype; savedvalstype* savedvals=nullptr; - if(count>0){ - savedvals = xbt_new0(savedvalstype, count); - } + + 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) { @@ -671,7 +672,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta 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, -1, -1, __FUNCTION__,extra); + TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); *index = simgrid::smpi::Request::waitany(count, requests, status); @@ -682,12 +683,11 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta 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(rank_traced, src_traced, dst_traced, savedvals[*index].tag); + 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, src_traced, dst_traced, __FUNCTION__); + TRACE_smpi_ptp_out(rank_traced, dst_traced, __FUNCTION__); } xbt_free(savedvals); @@ -721,25 +721,25 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[]) 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, -1, -1, __FUNCTION__,extra); + TRACE_smpi_ptp_in(rank_traced, __FUNCTION__,extra); 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) + // 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(rank_traced, src_traced, dst_traced,savedvals[i].tag); + 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_ptp_out(rank_traced, -1, -1, __FUNCTION__); + TRACE_smpi_ptp_out(rank_traced, -1, __FUNCTION__); xbt_free(savedvals); smpi_bench_begin();