From: Augustin Degomme Date: Wed, 6 Jun 2018 09:26:42 +0000 (+0200) Subject: add back tracing of communications in wait/waitany/waitall, should fix #269 X-Git-Tag: v3.20~146^2~2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a8c07a9421aa8cad9f88c2d04dbba1383efec724 add back tracing of communications in wait/waitany/waitall, should fix #269 --- diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp index fa24998944..e015c6c44e 100644 --- a/src/smpi/bindings/smpi_pmpi_request.cpp +++ b/src/smpi/bindings/smpi_pmpi_request.cpp @@ -617,7 +617,7 @@ static void trace_smpi_recv_helper(MPI_Request* request, MPI_Status* status) 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_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()); } } @@ -636,6 +636,10 @@ 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 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 @@ -647,7 +651,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(); @@ -663,6 +669,12 @@ 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 + MPI_Request* savedreqs= static_cast(xbt_malloc(count * sizeof(MPI_Request))); + memcpy(savedreqs, requests, count * sizeof(MPI_Request)); + for(int i=0; iflags() & MPI_REQ_FINISHED)) + savedreqs[i]->ref(); 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))); @@ -670,9 +682,14 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta *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(int i=0; iflags() & MPI_REQ_FINISHED)) + simgrid::smpi::Request::unref(&(savedreqs[i])); + xbt_free(savedreqs); smpi_bench_begin(); return MPI_SUCCESS; @@ -682,16 +699,28 @@ 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 + MPI_Request* savedreqs= static_cast(xbt_malloc(count * sizeof(MPI_Request))); + memcpy(savedreqs, requests, count * sizeof(MPI_Request)); + for(int i=0; iflags() & MPI_REQ_FINISHED)) + savedreqs[i]->ref(); + 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(int i=0; iflags() & MPI_REQ_FINISHED)) + simgrid::smpi::Request::unref(&(savedreqs[i])); + xbt_free(savedreqs); + smpi_bench_begin(); return retval; } diff --git a/src/smpi/include/smpi_request.hpp b/src/smpi/include/smpi_request.hpp index 0a8d220217..d6cb8d8bf0 100644 --- a/src/smpi/include/smpi_request.hpp +++ b/src/smpi/include/smpi_request.hpp @@ -54,7 +54,7 @@ class Request : public F2C { void print_request(const char *message); void start(); void cancel(); - + void ref(); static void finish_wait(MPI_Request* request, MPI_Status * status); static void unref(MPI_Request* request); static void wait(MPI_Request* req, MPI_Status * status); diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index f29ae8a863..979b0dffe9 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -107,6 +107,10 @@ size_t Request::real_size(){ return real_size_; } +void Request::ref(){ + refcount_++; +} + void Request::unref(MPI_Request* request) { if((*request) != MPI_REQUEST_NULL){ @@ -361,7 +365,7 @@ void Request::start() xbt_assert(action_ == nullptr, "Cannot (re-)start unfinished communication"); flags_ &= ~MPI_REQ_PREPARED; flags_ &= ~MPI_REQ_FINISHED; - refcount_++; + this->ref(); if ((flags_ & MPI_REQ_RECV) != 0) { this->print_request("New recv"); @@ -431,7 +435,7 @@ void Request::start() void *oldbuf = nullptr; detached_ = 1; XBT_DEBUG("Send request %p is detached", this); - refcount_++; + this->ref(); if (not(old_type_->flags() & DT_FLAG_DERIVED)) { oldbuf = buf_; if (not process->replaying() && oldbuf != nullptr && size_ != 0) {