add instance check to functions with arrays of requests

Signed-off-by: tomhers <[email protected]>

Author: tomhers

ompi/mpi/c/testall.c

@@ -56,6 +56,7 @@ int MPI_Testall(int count, MPI_Request requests[], int *flag,
 
     if ( MPI_PARAM_CHECK ) {
         int i, rc = MPI_SUCCESS;
+        MPI_Request check_req = NULL;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if( (NULL == requests) && (0 != count) ) {
             rc = MPI_ERR_REQUEST;
@@ -65,6 +66,16 @@ int MPI_Testall(int count, MPI_Request requests[], int *flag,
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
+                if (requests[i] == &ompi_request_empty) continue;
+                else if (check_req == NULL) {
+                    check_req = requests[i];
+                }
+                else {
+                    if (requests[i]->req_mpi_object.comm->instance != check_req->req_mpi_object.comm->instance) {
+                        rc = MPI_ERR_REQUEST;
+                        break;
+                    }
+                }
             }
         }
         if ((NULL == flag) || (count < 0)) {

ompi/mpi/c/testany.c

@@ -55,6 +55,7 @@ int MPI_Testany(int count, MPI_Request requests[], int *indx, int *completed, MP
 
     if ( MPI_PARAM_CHECK ) {
         int i, rc = MPI_SUCCESS;
+        MPI_Request check_req = NULL;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if ((NULL == requests) && (0 != count)) {
             rc = MPI_ERR_REQUEST;
@@ -64,6 +65,16 @@ int MPI_Testany(int count, MPI_Request requests[], int *indx, int *completed, MP
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
+                if (requests[i] == &ompi_request_empty) continue;
+                else if (check_req == NULL) {
+                    check_req = requests[i];
+                }
+                else {
+                    if (requests[i]->req_mpi_object.comm->instance != check_req->req_mpi_object.comm->instance) {
+                        rc = MPI_ERR_REQUEST;
+                        break;
+                    }
+                }
             }
         }
         if (((NULL == indx || NULL == completed) && count > 0) ||

ompi/mpi/c/testsome.c

@@ -57,6 +57,7 @@ int MPI_Testsome(int incount, MPI_Request requests[],
 
     if ( MPI_PARAM_CHECK ) {
         int indx, rc = MPI_SUCCESS;
+        MPI_Request check_req = NULL;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if ((NULL == requests) && (0 != incount)) {
             rc = MPI_ERR_REQUEST;
@@ -66,6 +67,16 @@ int MPI_Testsome(int incount, MPI_Request requests[],
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
+                if (requests[indx] == &ompi_request_empty) continue;
+                else if (check_req == NULL) {
+                    check_req = requests[indx];
+                }
+                else {
+                    if (requests[indx]->req_mpi_object.comm->instance != check_req->req_mpi_object.comm->instance) {
+                        rc = MPI_ERR_REQUEST;
+                        break;
+                    }
+                }
             }
         }
         if (((NULL == outcount || NULL == indices) && incount > 0) ||

ompi/mpi/c/waitall.c

@@ -54,6 +54,7 @@ int MPI_Waitall(int count, MPI_Request requests[], MPI_Status statuses[])
 
     if ( MPI_PARAM_CHECK ) {
         int i, rc = MPI_SUCCESS;
+        MPI_Request check_req = NULL;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if( (NULL == requests) && (0 != count) ) {
             rc = MPI_ERR_REQUEST;
@@ -63,6 +64,16 @@ int MPI_Waitall(int count, MPI_Request requests[], MPI_Status statuses[])
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
+                if (requests[i] == &ompi_request_empty) continue;
+                else if (check_req == NULL) {
+                    check_req = requests[i];
+                }
+                else {
+                    if (requests[i]->req_mpi_object.comm->instance != check_req->req_mpi_object.comm->instance) {
+                        rc = MPI_ERR_REQUEST;
+                        break;
+                    }
+                }
             }
         }
         if (count < 0) {

ompi/mpi/c/waitany.c

@@ -55,6 +55,7 @@ int MPI_Waitany(int count, MPI_Request requests[], int *indx, MPI_Status *status
 
     if ( MPI_PARAM_CHECK ) {
         int i, rc = MPI_SUCCESS;
+        MPI_Request check_req = NULL;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if ((NULL == requests) && (0 != count)) {
             rc = MPI_ERR_REQUEST;
@@ -64,6 +65,16 @@ int MPI_Waitany(int count, MPI_Request requests[], int *indx, MPI_Status *status
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
+                if (requests[i] == &ompi_request_empty) continue;
+                else if (check_req == NULL) {
+                    check_req = requests[i];
+                }
+                else {
+                    if (requests[i]->req_mpi_object.comm->instance != check_req->req_mpi_object.comm->instance) {
+                        rc = MPI_ERR_REQUEST;
+                        break;
+                    }
+                }
             }
         }
         if ((NULL == indx && count > 0) ||

ompi/mpi/c/waitsome.c

@@ -57,6 +57,7 @@ int MPI_Waitsome(int incount, MPI_Request requests[],
 
     if ( MPI_PARAM_CHECK ) {
         int indx, rc = MPI_SUCCESS;
+        MPI_Request check_req = NULL;
         OMPI_ERR_INIT_FINALIZE(FUNC_NAME);
         if ((NULL == requests) && (0 != incount)) {
             rc = MPI_ERR_REQUEST;
@@ -66,6 +67,16 @@ int MPI_Waitsome(int incount, MPI_Request requests[],
                     rc = MPI_ERR_REQUEST;
                     break;
                 }
+                if (requests[indx] == &ompi_request_empty) continue;
+                else if (check_req == NULL) {
+                    check_req = requests[indx];
+                }
+                else {
+                    if (requests[indx]->req_mpi_object.comm->instance != check_req->req_mpi_object.comm->instance) {
+                        rc = MPI_ERR_REQUEST;
+                        break;
+                    }
+                }
             }
         }
         if (((NULL == outcount || NULL == indices) && incount > 0) ||