X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b87fc0829538ec066fd077e6c30ee6270b8abd78..ab4d43a39df33bb5f24c3b2cc6d576130b16a649:/src/smpi/mpi/smpi_request.cpp diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index 0edf5281b6..3b4f02d013 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -1,20 +1,22 @@ -/* 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. */ #include "smpi_request.hpp" -#include "mc/mc.h" -#include "src/kernel/activity/CommImpl.hpp" -#include "src/mc/mc_replay.h" #include "SmpiHost.hpp" -#include "private.h" +#include "mc/mc.h" #include "private.hpp" #include "smpi_comm.hpp" #include "smpi_datatype.hpp" #include "smpi_op.hpp" #include "smpi_process.hpp" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/mc/mc_replay.hpp" +#include "src/simix/ActorImpl.hpp" +#include "xbt/config.hpp" +#include #include @@ -32,7 +34,8 @@ extern void (*smpi_comm_copy_data_callback) (smx_activity_t, void*, size_t); namespace simgrid{ namespace smpi{ -Request::Request(void *buf, int count, MPI_Datatype datatype, int src, int dst, int tag, MPI_Comm comm, unsigned flags) : buf_(buf), old_type_(datatype), src_(src), dst_(dst), tag_(tag), comm_(comm), flags_(flags) +Request::Request(void* buf, int count, MPI_Datatype datatype, int src, int dst, int tag, MPI_Comm comm, unsigned flags) + : buf_(buf), old_type_(datatype), src_(src), dst_(dst), tag_(tag), comm_(comm), flags_(flags) { void *old_buf = nullptr; // FIXME Handle the case of a partial shared malloc. @@ -65,6 +68,7 @@ Request::Request(void *buf, int count, MPI_Datatype datatype, int src, int dst, else refcount_ = 0; op_ = MPI_REPLACE; + cancelled_ = 0; } MPI_Comm Request::comm(){ @@ -91,6 +95,10 @@ int Request::detached(){ return detached_; } +MPI_Datatype Request::type(){ + return old_type_; +} + size_t Request::size(){ return size_; } @@ -103,7 +111,10 @@ void Request::unref(MPI_Request* request) { if((*request) != MPI_REQUEST_NULL){ (*request)->refcount_--; - if((*request)->refcount_<0) xbt_die("wrong refcount"); + if((*request)->refcount_ < 0) { + (*request)->print_request("wrong refcount"); + xbt_die("Whoops, wrong refcount"); + } if((*request)->refcount_==0){ Datatype::unref((*request)->old_type_); Comm::unref((*request)->comm_); @@ -137,6 +148,8 @@ int Request::match_recv(void* a, void* b, simgrid::kernel::activity::CommImpl* i ref->truncated_ = 1; if(req->detached_==1) ref->detached_sender_=req; //tie the sender to the receiver, as it is detached and has to be freed in the receiver + if(req->cancelled_==0) + req->cancelled_=-1;//mark as uncancellable XBT_DEBUG("match succeeded"); return 1; }else return 0; @@ -160,6 +173,8 @@ int Request::match_send(void* a, void* b, simgrid::kernel::activity::CommImpl* i req->truncated_ = 1; if(ref->detached_==1) req->detached_sender_=ref; //tie the sender to the receiver, as it is detached and has to be freed in the receiver + if(req->cancelled_==0) + req->cancelled_=-1;//mark as uncancellable XBT_DEBUG("match succeeded"); return 1; } else @@ -177,20 +192,20 @@ void Request::print_request(const char *message) MPI_Request Request::send_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - return new Request(buf==MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process()->index(), - comm->group()->index(dst), tag, comm, PERSISTENT | SEND | PREPARED); + return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, PERSISTENT | SEND | PREPARED); } MPI_Request Request::ssend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - return new Request(buf==MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process()->index(), - comm->group()->index(dst), tag, comm, PERSISTENT | SSEND | SEND | PREPARED); + return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, PERSISTENT | SSEND | SEND | PREPARED); } MPI_Request Request::isend_init(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { - return new Request(buf==MPI_BOTTOM ? nullptr : buf , count, datatype, smpi_process()->index(), - comm->group()->index(dst), tag,comm, PERSISTENT | ISEND | SEND | PREPARED); + return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, PERSISTENT | ISEND | SEND | PREPARED); } @@ -199,11 +214,13 @@ MPI_Request Request::rma_send_init(void *buf, int count, MPI_Datatype datatype, { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ if(op==MPI_OP_NULL){ - request = new Request(buf==MPI_BOTTOM ? nullptr : buf , count, datatype, src, dst, tag, - comm, RMA | NON_PERSISTENT | ISEND | SEND | PREPARED); + request = + new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, comm->group()->actor(src)->get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, RMA | NON_PERSISTENT | ISEND | SEND | PREPARED); }else{ - request = new Request(buf==MPI_BOTTOM ? nullptr : buf, count, datatype, src, dst, tag, - comm, RMA | NON_PERSISTENT | ISEND | SEND | PREPARED | ACCUMULATE); + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, comm->group()->actor(src)->get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, + RMA | NON_PERSISTENT | ISEND | SEND | PREPARED | ACCUMULATE); request->op_ = op; } return request; @@ -211,9 +228,9 @@ MPI_Request Request::rma_send_init(void *buf, int count, MPI_Datatype datatype, MPI_Request Request::recv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { - return new Request(buf==MPI_BOTTOM ? nullptr : buf, count, datatype, - src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->index(src), - smpi_process()->index(), tag, comm, PERSISTENT | RECV | PREPARED); + return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, + src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(src)->get_pid(), + simgrid::s4u::this_actor::get_pid(), tag, comm, PERSISTENT | RECV | PREPARED); } MPI_Request Request::rma_recv_init(void *buf, int count, MPI_Datatype datatype, int src, int dst, int tag, MPI_Comm comm, @@ -221,10 +238,11 @@ MPI_Request Request::rma_recv_init(void *buf, int count, MPI_Datatype datatype, { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ if(op==MPI_OP_NULL){ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, src, dst, tag, comm, - RMA | NON_PERSISTENT | RECV | PREPARED); + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, comm->group()->actor(src)->get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, RMA | NON_PERSISTENT | RECV | PREPARED); }else{ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, src, dst, tag, comm, + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, comm->group()->actor(src)->get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, RMA | NON_PERSISTENT | RECV | PREPARED | ACCUMULATE); request->op_ = op; } @@ -234,15 +252,15 @@ MPI_Request Request::rma_recv_init(void *buf, int count, MPI_Datatype datatype, MPI_Request Request::irecv_init(void *buf, int count, MPI_Datatype datatype, int src, int tag, MPI_Comm comm) { return new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, - src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->index(src), smpi_process()->index(), tag, - comm, PERSISTENT | RECV | PREPARED); + src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(src)->get_pid(), + simgrid::s4u::this_actor::get_pid(), tag, comm, PERSISTENT | RECV | PREPARED); } MPI_Request Request::isend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process()->index(), - comm->group()->index(dst), tag, comm, NON_PERSISTENT | ISEND | SEND); + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, NON_PERSISTENT | ISEND | SEND); request->start(); return request; } @@ -250,8 +268,8 @@ MPI_Request Request::isend(void *buf, int count, MPI_Datatype datatype, int dst, MPI_Request Request::issend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process()->index(), - comm->group()->index(dst), tag, comm, NON_PERSISTENT | ISEND | SSEND | SEND); + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, NON_PERSISTENT | ISEND | SSEND | SEND); request->start(); return request; } @@ -261,8 +279,8 @@ MPI_Request Request::irecv(void *buf, int count, MPI_Datatype datatype, int src, { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, - src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->index(src), smpi_process()->index(), - tag, comm, NON_PERSISTENT | RECV); + src == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(src)->get_pid(), + simgrid::s4u::this_actor::get_pid(), tag, comm, NON_PERSISTENT | RECV); request->start(); return request; } @@ -278,8 +296,8 @@ void Request::recv(void *buf, int count, MPI_Datatype datatype, int src, int tag void Request::send(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process()->index(), - comm->group()->index(dst), tag, comm, NON_PERSISTENT | SEND); + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, NON_PERSISTENT | SEND); request->start(); wait(&request, MPI_STATUS_IGNORE); @@ -289,8 +307,8 @@ void Request::send(void *buf, int count, MPI_Datatype datatype, int dst, int tag void Request::ssend(void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) { MPI_Request request = nullptr; /* MC needs the comm to be set to nullptr during the call */ - request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, smpi_process()->index(), - comm->group()->index(dst), tag, comm, NON_PERSISTENT | SSEND | SEND); + request = new Request(buf == MPI_BOTTOM ? nullptr : buf, count, datatype, simgrid::s4u::this_actor::get_pid(), + comm->group()->actor(dst)->get_pid(), tag, comm, NON_PERSISTENT | SSEND | SEND); request->start(); wait(&request,MPI_STATUS_IGNORE); @@ -303,10 +321,16 @@ void Request::sendrecv(void *sendbuf, int sendcount, MPI_Datatype sendtype,int d { MPI_Request requests[2]; MPI_Status stats[2]; - int myid=smpi_process()->index(); - if ((comm->group()->index(dst) == myid) && (comm->group()->index(src) == myid)){ - Datatype::copy(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype); - return; + int myid = simgrid::s4u::this_actor::get_pid(); + if ((comm->group()->actor(dst)->get_pid() == myid) && (comm->group()->actor(src)->get_pid() == myid)) { + Datatype::copy(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype); + if (status != MPI_STATUS_IGNORE) { + status->MPI_SOURCE = src; + status->MPI_TAG = recvtag; + status->MPI_ERROR = MPI_SUCCESS; + status->count = sendcount * sendtype->size(); + } + return; } requests[0] = isend_init(sendbuf, sendcount, sendtype, dst, sendtag, comm); requests[1] = irecv_init(recvbuf, recvcount, recvtype, src, recvtag, comm); @@ -332,9 +356,9 @@ void Request::start() if ((flags_ & RECV) != 0) { this->print_request("New recv"); - simgrid::smpi::Process* process = smpi_process_remote(dst_); + simgrid::smpi::Process* process = smpi_process_remote(simgrid::s4u::Actor::by_pid(dst_)); - int async_small_thresh = xbt_cfg_get_int("smpi/async-small-thresh"); + int async_small_thresh = simgrid::config::get_config("smpi/async-small-thresh"); xbt_mutex_t mut = process->mailboxes_mutex(); if (async_small_thresh != 0 || (flags_ & RMA) != 0) @@ -377,14 +401,14 @@ void Request::start() // we make a copy here, as the size is modified by simix, and we may reuse the request in another receive later real_size_=size_; action_ = simcall_comm_irecv( - process->process(), mailbox, buf_, &real_size_, &match_recv, + process->process()->get_impl(), mailbox, buf_, &real_size_, &match_recv, process->replaying() ? &smpi_comm_null_copy_buffer_callback : smpi_comm_copy_data_callback, this, -1.0); XBT_DEBUG("recv simcall posted"); if (async_small_thresh != 0 || (flags_ & RMA) != 0 ) xbt_mutex_release(mut); } else { /* the RECV flag was not set, so this is a send */ - simgrid::smpi::Process* process = smpi_process_remote(dst_); + simgrid::smpi::Process* process = smpi_process_remote(simgrid::s4u::Actor::by_pid(dst_)); int rank = src_; if (TRACE_smpi_view_internals()) { TRACE_smpi_send(rank, rank, dst_, tag_, size_); @@ -392,8 +416,9 @@ void Request::start() this->print_request("New send"); void* buf = buf_; - if ((flags_ & SSEND) == 0 && ( (flags_ & RMA) != 0 - || static_cast(size_) < xbt_cfg_get_int("smpi/send-is-detached-thresh") ) ) { + if ((flags_ & SSEND) == 0 && + ((flags_ & RMA) != 0 || + static_cast(size_) < simgrid::config::get_config("smpi/send-is-detached-thresh"))) { void *oldbuf = nullptr; detached_ = 1; XBT_DEBUG("Send request %p is detached", this); @@ -401,11 +426,11 @@ void Request::start() if (not(old_type_->flags() & DT_FLAG_DERIVED)) { oldbuf = buf_; if (not process->replaying() && oldbuf != nullptr && size_ != 0) { - if((smpi_privatize_global_variables != 0) - && (static_cast(buf_) >= smpi_start_data_exe) - && (static_cast(buf_) < smpi_start_data_exe + smpi_size_data_exe )){ + if ((smpi_privatize_global_variables != SmpiPrivStrategies::None) && + (static_cast(buf_) >= smpi_data_exe_start) && + (static_cast(buf_) < smpi_data_exe_start + smpi_data_exe_size)) { XBT_DEBUG("Privatization : We are sending from a zone inside global memory. Switch data segment "); - smpi_switch_data_segment(src_); + smpi_switch_data_segment(simgrid::s4u::Actor::by_pid(src_)); } buf = xbt_malloc(size_); memcpy(buf,oldbuf,size_); @@ -419,8 +444,8 @@ void Request::start() if (detached_ != 0 || ((flags_ & (ISEND | SSEND)) != 0)) { // issend should be treated as isend // isend and send timings may be different sleeptime = ((flags_ & ISEND) != 0) - ? simgrid::s4u::Actor::self()->getHost()->extension()->oisend(size_) - : simgrid::s4u::Actor::self()->getHost()->extension()->osend(size_); + ? simgrid::s4u::Actor::self()->get_host()->extension()->oisend(size_) + : simgrid::s4u::Actor::self()->get_host()->extension()->osend(size_); } if(sleeptime > 0.0){ @@ -428,7 +453,7 @@ void Request::start() XBT_DEBUG("sending size of %zu : sleep %f ", size_, sleeptime); } - int async_small_thresh = xbt_cfg_get_int("smpi/async-small-thresh"); + int async_small_thresh = simgrid::config::get_config("smpi/async-small-thresh"); xbt_mutex_t mut=process->mailboxes_mutex(); @@ -465,7 +490,7 @@ void Request::start() // we make a copy here, as the size is modified by simix, and we may reuse the request in another receive later real_size_=size_; action_ = simcall_comm_isend( - SIMIX_process_from_PID(src_ + 1), mailbox, size_, -1.0, buf, real_size_, &match_send, + simgrid::s4u::Actor::by_pid(src_)->get_impl(), mailbox, size_, -1.0, buf, real_size_, &match_send, &xbt_free_f, // how to free the userdata if a detached send fails not process->replaying() ? smpi_comm_copy_data_callback : &smpi_comm_null_copy_buffer_callback, this, // detach if msg size < eager/rdv switch limit @@ -490,6 +515,14 @@ void Request::startall(int count, MPI_Request * requests) } } +void Request::cancel() +{ + if(cancelled_!=-1) + cancelled_=1; + if (this->action_ != nullptr) + (boost::static_pointer_cast(this->action_))->cancel(); +} + int Request::test(MPI_Request * request, MPI_Status * status) { //assume that request is not MPI_REQUEST_NULL (filtered in PMPI_Test or testall before) // to avoid deadlocks if used as a break condition, such as @@ -503,14 +536,19 @@ int Request::test(MPI_Request * request, MPI_Status * status) { Status::empty(status); int flag = 1; if (((*request)->flags_ & PREPARED) == 0) { - if ((*request)->action_ != nullptr) - flag = simcall_comm_test((*request)->action_); + if ((*request)->action_ != nullptr){ + try{ + flag = simcall_comm_test((*request)->action_); + }catch (xbt_ex& e) { + return 0; + } + } if (flag) { finish_wait(request,status); nsleeps=1;//reset the number of sleeps we will do next time - if (*request != MPI_REQUEST_NULL && ((*request)->flags_ & PERSISTENT)==0) - *request = MPI_REQUEST_NULL; - } else if (xbt_cfg_get_boolean("smpi/grow-injected-times")){ + if (*request != MPI_REQUEST_NULL && ((*request)->flags_ & PERSISTENT) == 0) + *request = MPI_REQUEST_NULL; + } else if (simgrid::config::get_config("smpi/grow-injected-times")) { nsleeps++; } } @@ -565,8 +603,12 @@ int Request::testany(int count, MPI_Request requests[], int *index, MPI_Status * static int nsleeps = 1; if(smpi_test_sleep > 0) simcall_process_sleep(nsleeps*smpi_test_sleep); - - i = simcall_comm_testany(comms.data(), comms.size()); // The i-th element in comms matches! + try{ + i = simcall_comm_testany(comms.data(), comms.size()); // The i-th element in comms matches! + }catch (xbt_ex& e) { + return 0; + } + if (i != -1) { // -1 is not MPI_UNDEFINED but a SIMIX return code. (nothing matches) *index = map[i]; finish_wait(&requests[*index],status); @@ -625,12 +667,15 @@ void Request::iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* // nsleeps is a multiplier to the sleeptime, to increase speed of execution, each failed iprobe will increase it // This can speed up the execution of certain applications by an order of magnitude, such as HPL static int nsleeps = 1; - double speed = simgrid::s4u::Actor::self()->getHost()->getSpeed(); + double speed = simgrid::s4u::Actor::self()->get_host()->getSpeed(); double maxrate = xbt_cfg_get_double("smpi/iprobe-cpu-usage"); - MPI_Request request = new Request(nullptr, 0, MPI_CHAR, source == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : - comm->group()->index(source), comm->rank(), tag, comm, PERSISTENT | RECV); + MPI_Request request = new Request(nullptr, 0, MPI_CHAR, + source == MPI_ANY_SOURCE ? MPI_ANY_SOURCE : comm->group()->actor(source)->get_pid(), + simgrid::s4u::this_actor::get_pid(), tag, comm, PERSISTENT | RECV); if (smpi_iprobe_sleep > 0) { - smx_activity_t iprobe_sleep = simcall_execution_start("iprobe", /* flops to executek*/nsleeps*smpi_iprobe_sleep*speed*maxrate, /* priority */1.0, /* performance bound */maxrate*speed); + smx_activity_t iprobe_sleep = simcall_execution_start( + "iprobe", /* flops to executek*/ nsleeps * smpi_iprobe_sleep * speed * maxrate, /* priority */ 1.0, + /* performance bound */ maxrate * speed, smpi_process()->process()->get_impl()->host); simcall_execution_wait(iprobe_sleep); } // behave like a receive, but don't do it @@ -638,10 +683,10 @@ void Request::iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* request->print_request("New iprobe"); // We have to test both mailboxes as we don't know if we will receive one one or another - if (xbt_cfg_get_int("smpi/async-small-thresh") > 0){ - mailbox = smpi_process()->mailbox_small(); - XBT_DEBUG("Trying to probe the perm recv mailbox"); - request->action_ = simcall_comm_iprobe(mailbox, 0, &match_recv, static_cast(request)); + if (simgrid::config::get_config("smpi/async-small-thresh") > 0) { + mailbox = smpi_process()->mailbox_small(); + XBT_DEBUG("Trying to probe the perm recv mailbox"); + request->action_ = simcall_comm_iprobe(mailbox, 0, &match_recv, static_cast(request)); } if (request->action_ == nullptr){ @@ -665,7 +710,7 @@ void Request::iprobe(int source, int tag, MPI_Comm comm, int* flag, MPI_Status* } else { *flag = 0; - if (xbt_cfg_get_boolean("smpi/grow-injected-times")) + if (simgrid::config::get_config("smpi/grow-injected-times")) nsleeps++; } unref(&request); @@ -675,6 +720,12 @@ void Request::finish_wait(MPI_Request* request, MPI_Status * status) { MPI_Request req = *request; Status::empty(status); + + if (req->cancelled_==1){ + if (status!=MPI_STATUS_IGNORE) + status->cancelled=1; + return; + } if (not((req->detached_ != 0) && ((req->flags_ & SEND) != 0)) && ((req->flags_ & PREPARED) == 0)) { if(status != MPI_STATUS_IGNORE) { @@ -693,12 +744,11 @@ void Request::finish_wait(MPI_Request* request, MPI_Status * status) if (((req->flags_ & ACCUMULATE) != 0) || (datatype->flags() & DT_FLAG_DERIVED)) { // && (not smpi_is_shared(req->old_buf_))){ - if (not smpi_process()->replaying()) { - if( smpi_privatize_global_variables != 0 && (static_cast(req->old_buf_) >= smpi_start_data_exe) - && ((char*)req->old_buf_ < smpi_start_data_exe + smpi_size_data_exe )){ - XBT_VERB("Privatization : We are unserializing to a zone in global memory Switch data segment "); - smpi_switch_data_segment(smpi_process()->index()); - } + if (not smpi_process()->replaying() && smpi_privatize_global_variables != SmpiPrivStrategies::None && + static_cast(req->old_buf_) >= smpi_data_exe_start && + static_cast(req->old_buf_) < smpi_data_exe_start + smpi_data_exe_size) { + XBT_VERB("Privatization : We are unserializing to a zone in global memory Switch data segment "); + smpi_switch_data_segment(simgrid::s4u::Actor::self()); } if(datatype->flags() & DT_FLAG_DERIVED){ @@ -717,14 +767,14 @@ void Request::finish_wait(MPI_Request* request, MPI_Status * status) } if (TRACE_smpi_view_internals() && ((req->flags_ & RECV) != 0)){ - int rank = smpi_process()->index(); + int rank = simgrid::s4u::this_actor::get_pid(); int src_traced = (req->src_ == MPI_ANY_SOURCE ? req->real_src_ : req->src_); TRACE_smpi_recv(src_traced, rank,req->tag_); } if(req->detached_sender_ != nullptr){ //integrate pseudo-timing for buffering of small messages, do not bother to execute the simcall if 0 double sleeptime = - simgrid::s4u::Actor::self()->getHost()->extension()->orecv(req->real_size()); + simgrid::s4u::Actor::self()->get_host()->extension()->orecv(req->real_size()); if(sleeptime > 0.0){ simcall_process_sleep(sleeptime); XBT_DEBUG("receiving size of %zu : sleep %f ", req->real_size_, sleeptime); @@ -745,9 +795,15 @@ void Request::wait(MPI_Request * request, MPI_Status * status) return; } - if ((*request)->action_ != nullptr) - // this is not a detached send - simcall_comm_wait((*request)->action_, -1.0); + if ((*request)->action_ != nullptr){ + try{ + // this is not a detached send + simcall_comm_wait((*request)->action_, -1.0); + }catch (xbt_ex& e) { + XBT_VERB("Request cancelled"); + } + } + finish_wait(request,status); if (*request != MPI_REQUEST_NULL && (((*request)->flags_ & NON_PERSISTENT)!=0)) @@ -789,7 +845,14 @@ int Request::waitany(int count, MPI_Request requests[], MPI_Status * status) } if (size > 0) { XBT_DEBUG("Enter waitany for %lu comms", xbt_dynar_length(&comms)); - int i = simcall_comm_waitany(&comms, -1); + int i=MPI_UNDEFINED; + try{ + // this is not a detached send + i = simcall_comm_waitany(&comms, -1); + }catch (xbt_ex& e) { + XBT_INFO("request %d cancelled ",i); + return i; + } // not MPI_UNDEFINED, as this is a simix return code if (i != -1) { @@ -843,6 +906,7 @@ int Request::waitall(int count, MPI_Request requests[], MPI_Status status[]) index = c; } else { index = waitany(count, (MPI_Request*)requests, pstat); + if (index == MPI_UNDEFINED) break; @@ -862,7 +926,7 @@ int Request::waitall(int count, MPI_Request requests[], MPI_Status status[]) if (not accumulates.empty()) { std::sort(accumulates.begin(), accumulates.end(), sort_accumulates); - for (auto req : accumulates) { + for (auto& req : accumulates) { finish_wait(&req, status); } } @@ -885,7 +949,7 @@ int Request::waitsome(int incount, MPI_Request requests[], int *indices, MPI_Sta status[index] = *pstat; } if (requests[index] != MPI_REQUEST_NULL && (requests[index]->flags_ & NON_PERSISTENT)) - requests[index]=MPI_REQUEST_NULL; + requests[index] = MPI_REQUEST_NULL; }else{ return MPI_UNDEFINED; }