[SMPI] Remove local variables

[simgrid.git] / 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 84a929d..970e3f1 100644 (file)
--- a/src/smpi/bindings/smpi_pmpi_request.cpp
+++ b/src/smpi/bindings/smpi_pmpi_request.cpp
@@ -603,13 +603,12 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
 
   if(*index!=MPI_UNDEFINED){
     MPI_Request req = requests[*index];
-    if (req != nullptr) { // Requests that were already received will be a nullptr
+    if (req != MPI_REQUEST_NULL) { // Received requests become null
       int src_traced = req->src();
       // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
       int dst_traced          = req->dst();
-      int is_wait_for_receive = req->flags() & RECV;
-      if (is_wait_for_receive) {
-        if (req->src() == MPI_ANY_SOURCE)
+      if (req->flags() & RECV) {
+        if (src_traced == MPI_ANY_SOURCE)
           src_traced = (status != MPI_STATUSES_IGNORE) ? req->comm()->group()->rank(status->MPI_SOURCE) : req->src();
         TRACE_smpi_recv(src_traced, dst_traced, req->tag());
       }
@@ -624,46 +623,26 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
 int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
 {
   smpi_bench_end();
-  //save information from requests
-  struct savedvalstype {
-    int src;
-    int dst;
-    int recv;
-    int tag;
-    int valid;
-    MPI_Comm comm;
-  };
-  savedvalstype* savedvals=xbt_new0(savedvalstype, count);
 
-  for (int i = 0; i < count; i++) {
-    MPI_Request req = requests[i];
-    if(req!=MPI_REQUEST_NULL){
-      savedvals[i]=(savedvalstype){req->src(), req->dst(), (req->flags() & RECV), req->tag(), 1, req->comm()};
-    }else{
-      savedvals[i].valid=0;
-    }
-  }
   int rank_traced = smpi_process()->index();
   TRACE_smpi_comm_in(rank_traced, __FUNCTION__, new simgrid::instr::CpuTIData("waitAll", static_cast<double>(count)));
 
   int retval = simgrid::smpi::Request::waitall(count, requests, status);
 
   for (int i = 0; i < count; i++) {
-    if(savedvals[i].valid){
+    MPI_Request req = requests[i];
+    if (req != MPI_REQUEST_NULL) {
       // the src may not have been known at the beginning of the recv (MPI_ANY_SOURCE)
-      int src_traced = savedvals[i].src;
-      int dst_traced = savedvals[i].dst;
-      int is_wait_for_receive = savedvals[i].recv;
-      if (is_wait_for_receive) {
+      int src_traced = req->src();
+      int dst_traced = req->dst();
+      if ((req->flags() & RECV)) {
         if(src_traced==MPI_ANY_SOURCE)
-          src_traced = (status != MPI_STATUSES_IGNORE) ? savedvals[i].comm->group()->rank(status[i].MPI_SOURCE)
-                                                       : savedvals[i].src;
-        TRACE_smpi_recv(src_traced, dst_traced,savedvals[i].tag);
+          src_traced = (status != MPI_STATUSES_IGNORE) ? req->comm()->group()->rank(status[i].MPI_SOURCE) : req->src();
+        TRACE_smpi_recv(src_traced, dst_traced, req->tag());
       }
     }
   }
   TRACE_smpi_comm_out(rank_traced);
-  xbt_free(savedvals);
 
   smpi_bench_begin();
   return retval;