Changeset 1176 for XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_wait.cpp

Timestamp:

06/21/17 09:09:59 (7 years ago)

Author:

yushan

Message:

save modif

File:

• XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_wait.cpp (modified) (3 diffs)

XIOS/dev/branch_yushan_merged/extern/src_ep_dev/ep_wait.cpp

@@ -22 +22 @@
     if(request->type == 1)
     {
-      ::MPI_Request *mpi_request = static_cast< ::MPI_Request* >(&(request->mpi_request));
+      ::MPI_Request mpi_request = static_cast< ::MPI_Request >(request->mpi_request);
       ::MPI_Status mpi_status;
       ::MPI_Errhandler_set(MPI_COMM_WORLD_STD, MPI_ERRORS_RETURN);
-      int error_code = ::MPI_Wait(mpi_request, &mpi_status);
+      int error_code = ::MPI_Wait(&mpi_request, &mpi_status);
       if (error_code != MPI_SUCCESS) {
       
@@ -68 +68 @@
     if(request->type == 3)
     {
-      ::MPI_Request *mpi_request = static_cast< ::MPI_Request* >(&(request->mpi_request));
+      ::MPI_Request mpi_request = static_cast< ::MPI_Request >(request->mpi_request);
       ::MPI_Status mpi_status;
       ::MPI_Errhandler_set(MPI_COMM_WORLD_STD, MPI_ERRORS_RETURN);
-      int error_code = ::MPI_Wait(mpi_request, &mpi_status);
+      int error_code = ::MPI_Wait(&mpi_request, &mpi_status);
       if (error_code != MPI_SUCCESS) {
       
@@ -122 +122 @@
           if(array_of_requests[i].type != 2) // isend or imrecv
           {      
-            MPI_Wait(&array_of_requests[i], &array_of_statuses[i]);
-            //int tested=false;
-            //while(!tested) MPI_Test(&array_of_requests[i], &tested, &array_of_statuses[i]);
+            //MPI_Wait(&array_of_requests[i], &array_of_statuses[i]);
+            int tested;
+            MPI_Test(&array_of_requests[i], &tested, &array_of_statuses[i]);
+            if(!tested) MPI_Wait(&array_of_requests[i], &array_of_statuses[i]);
             finished++;
             finished_index[i] = true;