Set MPI_Request to MPI_REQUEST_NULL whenever a call fails

[simgrid.git] / src / smpi / smpi_pmpi.c

diff --git a/src/smpi/smpi_pmpi.c b/src/smpi/smpi_pmpi.c
index b753958..a572266 100644 (file)
--- a/src/smpi/smpi_pmpi.c
+++ b/src/smpi/smpi_pmpi.c
@@ -925,6 +925,7 @@ int PMPI_Send_init(void *buf, int count, MPI_Datatype datatype, int dst,
     retval = MPI_SUCCESS;
   }
   smpi_bench_begin();
+  if(retval!=MPI_SUCCESS)*request=MPI_REQUEST_NULL;
   return retval;
 }
 
@@ -945,6 +946,7 @@ int PMPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int src,
     retval = MPI_SUCCESS;
   }
   smpi_bench_begin();
+  if(retval!=MPI_SUCCESS)*request=MPI_REQUEST_NULL;
   return retval;
 }
 
@@ -963,6 +965,7 @@ int PMPI_Ssend_init(void* buf, int count, MPI_Datatype datatype, int dst, int ta
       retval = MPI_SUCCESS;
     }
     smpi_bench_begin();
+    if(retval!=MPI_SUCCESS)*request=MPI_REQUEST_NULL;
     return retval;
 }
 
@@ -1054,6 +1057,7 @@ int PMPI_Irecv(void *buf, int count, MPI_Datatype datatype, int src,
   }
 
   smpi_bench_begin();
+  if(retval!=MPI_SUCCESS)*request=MPI_REQUEST_NULL;
   return retval;
 }
 
@@ -1102,6 +1106,7 @@ int PMPI_Isend(void *buf, int count, MPI_Datatype datatype, int dst,
   }
 
   smpi_bench_begin();
+  if(retval!=MPI_SUCCESS)*request=MPI_REQUEST_NULL;
   return retval;
 }
 
@@ -1147,6 +1152,7 @@ int PMPI_Issend(void* buf, int count, MPI_Datatype datatype, int dst, int tag, M
   }
 
   smpi_bench_begin();
+  if(retval!=MPI_SUCCESS)*request=MPI_REQUEST_NULL;
   return retval;
 }
 
@@ -1549,7 +1555,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
     if (is_wait_for_receive) {
       if(srcs[*index]==MPI_ANY_SOURCE)
         src_traced = (status!=MPI_STATUSES_IGNORE) ?
-                      smpi_group_rank(smpi_comm_group(comms[*index]), status[*index].MPI_SOURCE) :
+                      smpi_group_rank(smpi_comm_group(comms[*index]), status->MPI_SOURCE) :
                       srcs[*index];
       TRACE_smpi_recv(rank_traced, src_traced, dst_traced);
     }
@@ -2563,6 +2569,10 @@ int PMPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) {
    NOT_YET_IMPLEMENTED
 }
 
+int PMPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler* errhandler) {
+   NOT_YET_IMPLEMENTED
+}
+
 int PMPI_Cancel(MPI_Request* request) {
    NOT_YET_IMPLEMENTED
 }