WRAPPED_PMPI_CALL(MPI_Op, MPI_Op_f2c,(MPI_Fint op),(op))
WRAPPED_PMPI_CALL(MPI_Request, MPI_Request_f2c,(MPI_Fint request),(request))
WRAPPED_PMPI_CALL(MPI_Win, MPI_Win_f2c,(MPI_Fint win),(win))
-
-
+WRAPPED_PMPI_CALL(int,MPI_Cancel,(MPI_Request* request) ,(request))
+WRAPPED_PMPI_CALL(int, MPI_Test_cancelled,(MPI_Status* status, int* flag) ,(status, flag))
/*
Unimplemented Calls - both PMPI and MPI calls are generated.
When implementing, please move ahead, swap UNIMPLEMENTED_WRAPPED_PMPI_CALL for WRAPPED_PMPI_CALL,
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Bsend,(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) ,(buf, count, datatype, dest, tag, comm))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Buffer_attach,(void* buffer, int size) ,(buffer, size))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Buffer_detach,(void* buffer, int* size) ,(buffer, size))
-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Cancel,(MPI_Request* request) ,(request))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Cart_map,(MPI_Comm comm_old, int ndims, int* dims, int* periods, int* newrank) ,(comm_old, ndims, dims, periods, newrank))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Close_port,( char *port_name),( port_name))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Comm_accept,( char *port_name, MPI_Info info, int root, MPI_Comm comm, MPI_Comm *newcomm),( port_name, info, root, comm, newcomm))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Rsend,(void* buf, int count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) ,(buf, count, datatype, dest, tag, comm))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Status_set_cancelled,(MPI_Status *status,int flag),(status,flag))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Status_set_elements,( MPI_Status *status, MPI_Datatype datatype, int count),( status, datatype, count))
-UNIMPLEMENTED_WRAPPED_PMPI_CALL(int, MPI_Test_cancelled,(MPI_Status* status, int* flag) ,(status, flag))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Topo_test,(MPI_Comm comm, int* top_type) ,(comm, top_type))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Type_create_darray,(int size, int rank, int ndims, int* array_of_gsizes, int* array_of_distribs, int* array_of_dargs, int* array_of_psizes,int order, MPI_Datatype oldtype, MPI_Datatype *newtype) ,(size, rank, ndims, array_of_gsizes,array_of_distribs, array_of_dargs, array_of_psizes,order,oldtype, newtype))
UNIMPLEMENTED_WRAPPED_PMPI_CALL(int,MPI_Type_get_contents,(MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, int* array_of_integers, MPI_Aint* array_of_addresses, MPI_Datatype *array_of_datatypes),(datatype, max_integers, max_addresses,max_datatypes, array_of_integers, array_of_addresses, array_of_datatypes))
#include "src/mc/mc_replay.hpp"
#include "src/simix/ActorImpl.hpp"
#include "xbt/config.hpp"
+#include <xbt/ex.hpp>
#include <algorithm>
else
refcount_ = 0;
op_ = MPI_REPLACE;
+ cancelled_ = 0;
}
MPI_Comm Request::comm(){
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;
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
}
}
+void Request::cancel()
+{
+ if(cancelled_!=-1)
+ cancelled_=1;
+ if (this->action_ != nullptr)
+ (boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(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
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
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);
{
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) {
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))
}
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) {
index = c;
} else {
index = waitany(count, (MPI_Request*)requests, pstat);
+
if (index == MPI_UNDEFINED)
break;
