Changeset 1520 for XIOS/dev/branch_openmp/extern/ep_dev/ep_test.cpp

Timestamp:

06/04/18 19:25:08 (6 years ago)

Author:

yushan

Message:

save dev. TO DO : test with xios

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_test.cpp (modified) (4 diffs)

XIOS/dev/branch_openmp/extern/ep_dev/ep_test.cpp

@@ -33 +33 @@
         status->ep_tag = (*request)->ep_tag;
         status->ep_datatype = (*request)->ep_datatype;
-        //delete request->mpi_request;
+        delete (*request)->mpi_request;
+        delete request;
       }
 
@@ -60 +61 @@
         status->ep_tag = (*request)->ep_tag;
         status->ep_datatype = (*request)->ep_datatype;
-        //delete request->mpi_request;
+        delete (*request)->mpi_request;
+        delete request;
         //int count;
         //MPI_Get_count(status, request->ep_datatype, &count);
@@ -75 +77 @@
   {
     Debug("MPI_Testall with EP");
-    *flag = true;
-    int i=0;
-    while(*flag && i<count )
+
+    ::MPI_Request* mpi_request = new ::MPI_Request[count];
+    ::MPI_Status* mpi_status = new ::MPI_Status[count];
+
+
+    for(int i=0; i<count; i++)
     {
-      MPI_Test(&array_of_requests[i], flag, &array_of_statuses[i]);
-      i++;
+      mpi_request[i] = *static_cast< ::MPI_Request*>(array_of_requests[i]->mpi_request);
+    }
+
+    ::MPI_Testall(count, mpi_request, flag, mpi_status);
+
+    if(flag)
+    {
+      for(int i=0; i<count; i++)
+      {
+        array_of_statuses[i].mpi_status = &mpi_status[i];
+        array_of_statuses[i].ep_src = array_of_requests[i]->ep_src;
+        array_of_statuses[i].ep_tag = array_of_requests[i]->ep_tag;
+        array_of_statuses[i].ep_datatype = array_of_requests[i]->ep_datatype;
+      
+        memcheck("delete "<< array_of_requests[i]->mpi_request <<" : in ep_lib::MPI_Waitall, array_of_requests["<<i<<"]->mpi_request");
+        delete array_of_requests[i]->mpi_request;
+        delete array_of_requests[i]; 
+      }
+      
     }
 
@@ -87 +109 @@
 
 }
+