X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a8c07a9421aa8cad9f88c2d04dbba1383efec724..dabc974c900a0e86479655752a6c915385d670e7:/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 e015c6c44e..19e2f997a3 100644
--- a/src/smpi/bindings/smpi_pmpi_request.cpp
+++ b/src/smpi/bindings/smpi_pmpi_request.cpp
@@ -522,11 +522,11 @@ int PMPI_Test(MPI_Request * request, int *flag, MPI_Status * status)
   } else {
     int my_proc_id = ((*request)->comm() != MPI_COMM_NULL) ? simgrid::s4u::this_actor::get_pid() : -1;
 
-    TRACE_smpi_testing_in(my_proc_id);
-
+    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("test"));
+    
     *flag = simgrid::smpi::Request::test(request,status);
 
-    TRACE_smpi_testing_out(my_proc_id);
+    TRACE_smpi_comm_out(my_proc_id);
     retval = MPI_SUCCESS;
   }
   smpi_bench_begin();
@@ -541,7 +541,10 @@ int PMPI_Testany(int count, MPI_Request requests[], int *index, int *flag, MPI_S
   if (index == nullptr || flag == nullptr) {
     retval = MPI_ERR_ARG;
   } else {
+    int my_proc_id = simgrid::s4u::this_actor::get_pid();
+    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testany"));
     *flag = simgrid::smpi::Request::testany(count, requests, index, status);
+    TRACE_smpi_comm_out(my_proc_id);
     retval = MPI_SUCCESS;
   }
   smpi_bench_begin();
@@ -556,13 +559,34 @@ int PMPI_Testall(int count, MPI_Request* requests, int* flag, MPI_Status* status
   if (flag == nullptr) {
     retval = MPI_ERR_ARG;
   } else {
+    int my_proc_id = simgrid::s4u::this_actor::get_pid();
+    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testall"));
     *flag = simgrid::smpi::Request::testall(count, requests, statuses);
+    TRACE_smpi_comm_out(my_proc_id);
     retval = MPI_SUCCESS;
   }
   smpi_bench_begin();
   return retval;
 }
 
+int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[])
+{
+  int retval = 0;
+
+  smpi_bench_end();
+  if (outcount == nullptr) {
+    retval = MPI_ERR_ARG;
+  } else {
+    int my_proc_id = simgrid::s4u::this_actor::get_pid();
+    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("testsome"));
+    *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status);
+    TRACE_smpi_comm_out(my_proc_id);
+    retval    = MPI_SUCCESS;
+  }
+  smpi_bench_begin();
+  return retval;
+}
+
 int PMPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status* status) {
   int retval = 0;
   smpi_bench_end();
@@ -637,14 +661,17 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status)
     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))
+    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
+    else
+      savedreq = MPI_REQUEST_NULL;
+
     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
-
-    TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("wait"));
+    TRACE_smpi_comm_in(my_proc_id, __func__,
+                       new simgrid::instr::WaitTIData((*request)->src(), (*request)->dst(), (*request)->tag()));
 
     simgrid::smpi::Request::wait(request, status);
     retval = MPI_SUCCESS;
@@ -652,7 +679,7 @@ 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(&savedreq, status);
-    if (savedreq!=MPI_REQUEST_NULL)
+    if (savedreq != MPI_REQUEST_NULL)
       simgrid::smpi::Request::unref(&savedreq);
   }
 
@@ -670,11 +697,13 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
 
   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<MPI_Request*>(xbt_malloc(count * sizeof(MPI_Request)));
-  memcpy(savedreqs, requests, count * sizeof(MPI_Request));
-  for(int i=0; i<count; i++)
-    if (savedreqs[i]!=MPI_REQUEST_NULL && not(savedreqs[i]->flags() & MPI_REQ_FINISHED))
-      savedreqs[i]->ref();
+  std::vector<MPI_Request> savedreqs(requests, requests + count);
+  for (MPI_Request& req : savedreqs) {
+    if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
+      req->ref();
+    else
+      req = MPI_REQUEST_NULL;
+  }
 
   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<double>(count)));
@@ -685,11 +714,10 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
     trace_smpi_recv_helper(&savedreqs[*index], status);
     TRACE_smpi_comm_out(rank_traced);
   }
-  
-  for(int i=0; i<count; i++)
-    if (savedreqs[i]!=MPI_REQUEST_NULL && not(savedreqs[i]->flags() & MPI_REQ_FINISHED))
-      simgrid::smpi::Request::unref(&(savedreqs[i]));
-  xbt_free(savedreqs);
+
+  for (MPI_Request& req : savedreqs)
+    if (req != MPI_REQUEST_NULL)
+      simgrid::smpi::Request::unref(&req);
 
   smpi_bench_begin();
   return MPI_SUCCESS;
@@ -700,14 +728,16 @@ 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<MPI_Request*>(xbt_malloc(count * sizeof(MPI_Request)));
-  memcpy(savedreqs, requests, count * sizeof(MPI_Request));
-  for(int i=0; i<count; i++)
-    if (savedreqs[i]!=MPI_REQUEST_NULL && not(savedreqs[i]->flags() & MPI_REQ_FINISHED))
-      savedreqs[i]->ref();
+  std::vector<MPI_Request> savedreqs(requests, requests + count);
+  for (MPI_Request& req : savedreqs) {
+    if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
+      req->ref();
+    else
+      req = MPI_REQUEST_NULL;
+  }
 
   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<double>(count)));
+  TRACE_smpi_comm_in(rank_traced, __func__, new simgrid::instr::CpuTIData("waitall", static_cast<double>(count)));
 
   int retval = simgrid::smpi::Request::waitall(count, requests, status);
 
@@ -716,10 +746,9 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
   }
   TRACE_smpi_comm_out(rank_traced);
 
-  for(int i=0; i<count; i++)
-    if (savedreqs[i]!=MPI_REQUEST_NULL && not(savedreqs[i]->flags() & MPI_REQ_FINISHED))
-      simgrid::smpi::Request::unref(&(savedreqs[i]));
-  xbt_free(savedreqs);
+  for (MPI_Request& req : savedreqs)
+    if (req != MPI_REQUEST_NULL)
+      simgrid::smpi::Request::unref(&req);
 
   smpi_bench_begin();
   return retval;
@@ -740,21 +769,6 @@ int PMPI_Waitsome(int incount, MPI_Request requests[], int *outcount, int *indic
   return retval;
 }
 
-int PMPI_Testsome(int incount, MPI_Request requests[], int* outcount, int* indices, MPI_Status status[])
-{
-  int retval = 0;
-
-  smpi_bench_end();
-  if (outcount == nullptr) {
-    retval = MPI_ERR_ARG;
-  } else {
-    *outcount = simgrid::smpi::Request::testsome(incount, requests, indices, status);
-    retval    = MPI_SUCCESS;
-  }
-  smpi_bench_begin();
-  return retval;
-}
-
 int PMPI_Cancel(MPI_Request* request)
 {
   int retval = 0;