X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6847a26d9973030337f6ef9f18464b1f04ce7452..8c416e92254512408c1d0ce729e8d3cf82ec9938:/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 8df9c83c4e..458f7f9608 100644
--- a/src/smpi/bindings/smpi_pmpi_request.cpp
+++ b/src/smpi/bindings/smpi_pmpi_request.cpp
@@ -89,6 +89,11 @@ int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dst, int ta
   return retval;
 }
 
+/*
+ * This function starts a request returned by init functions such as
+ * MPI_Send_init(), MPI_Ssend_init (see above), and friends.
+ * They should already have performed sanity checks.
+ */
 int PMPI_Start(MPI_Request * request)
 {
   int retval = 0;
@@ -97,8 +102,22 @@ int PMPI_Start(MPI_Request * request)
   if (request == nullptr || *request == MPI_REQUEST_NULL) {
     retval = MPI_ERR_REQUEST;
   } else {
-    (*request)->start();
+    MPI_Request req = *request;
+    int 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(), 
+                                                       simgrid::smpi::Datatype::encode(req->type())));
+    if (not TRACE_smpi_view_internals() && req->flags() & SEND)
+      TRACE_smpi_send(my_proc_id, my_proc_id, getPid(req->comm(), req->dst()), req->tag(), req->size());
+
+    req->start();
+
+    if (not TRACE_smpi_view_internals() && req->flags() & RECV)
+      TRACE_smpi_recv(getPid(req->comm(), req->src()), my_proc_id, req->tag());
     retval = MPI_SUCCESS;
+    TRACE_smpi_comm_out(my_proc_id);
   }
   smpi_bench_begin();
   return retval;
@@ -118,7 +137,25 @@ int PMPI_Startall(int count, MPI_Request * requests)
       }
     }
     if(retval != MPI_ERR_REQUEST) {
+      int 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];
+          if (req->flags() & SEND)
+            TRACE_smpi_send(my_proc_id, my_proc_id, getPid(req->comm(), req->dst()), req->tag(), req->size());
+        }
+
       simgrid::smpi::Request::startall(count, requests);
+
+      if (not TRACE_smpi_view_internals())
+        for (int i = 0; i < count; i++) {
+          req = requests[i];
+          if (req->flags() & RECV)
+            TRACE_smpi_recv(getPid(req->comm(), req->src()), my_proc_id, req->tag());
+        }
+      TRACE_smpi_comm_out(my_proc_id);
     }
   }
   smpi_bench_begin();
@@ -680,6 +717,30 @@ int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indic
   return retval;
 }
 
+int PMPI_Cancel(MPI_Request* request)
+{
+  int retval = 0;
+
+  smpi_bench_end();
+  if (*request == MPI_REQUEST_NULL) {
+    retval = MPI_ERR_REQUEST;
+  } else {
+    (*request)->cancel();
+    retval = MPI_SUCCESS;
+  }
+  smpi_bench_begin();
+  return retval;
+}
+
+int PMPI_Test_cancelled(MPI_Status* status, int* flag){
+  if(status==MPI_STATUS_IGNORE){
+    *flag=0;
+    return MPI_ERR_ARG;
+  }
+  *flag=simgrid::smpi::Status::cancelled(status);
+  return MPI_SUCCESS;  
+}
+
 MPI_Request PMPI_Request_f2c(MPI_Fint request){
   return static_cast<MPI_Request>(simgrid::smpi::Request::f2c(request));
 }