Changeset 1520 for XIOS/dev/branch_openmp/extern/src_ep_dev/ep_wait.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/src_ep_dev/ep_wait.cpp (modified) (7 diffs)

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

@@ -9 +9 @@
 #include <mpi.h>
 #include "ep_declaration.hpp"
+#include "ep_mpi.hpp"
 
 using namespace std;
@@ -22 +23 @@
   int MPI_Wait(MPI_Request *request, MPI_Status *status)
   {
-    if(request->type !=1 && request->type !=2 && request->type !=3) 
+    if((*request)->type !=1 && (*request)->type !=2 && (*request)->type !=3) 
     {
       printf("Error in request type\n");
@@ -29 +30 @@
     }
 
-    while(request->type == 2) Request_Check();
+    while((*request)->type == 2) Request_Check();
+    
+    ::MPI_Wait(to_mpi_request_ptr(*request), to_mpi_status_ptr(status));
 
+    
+    status->ep_src = (*request)->ep_src;
+    status->ep_tag = (*request)->ep_tag;
+    status->ep_datatype = (*request)->ep_datatype;
+    
+    (*request)->state = 2;
 
-    //::MPI_Request mpi_request = static_cast< ::MPI_Request >(request->mpi_request);
-    ::MPI_Status mpi_status;
-    ::MPI_Wait(static_cast< ::MPI_Request*>(request->mpi_request), &mpi_status);
-
-   
-           
- 
-    // request->mpi_request = mpi_request;
-
-    status->mpi_status = &mpi_status;
-    status->ep_src = request->ep_src;
-    status->ep_tag = request->ep_tag;
-    status->ep_datatype = request->ep_datatype;
+    memcheck("delete "<< (*request)->mpi_request << " : in ep_lib::MPI_Wait, delete (*request)->mpi_request");
+    delete (*request)->mpi_request;
+    delete *request;
     
 
-
-    return MPI_SUCCESS;
+    return Request_Check();
 
   }   /*end of mpi_wait*/
@@ -69 +67 @@
       for(int i=0; i<count; i++)
       {
-        if(array_of_requests[i].type !=1 && array_of_requests[i].type !=2 && array_of_requests[i].type !=3) 
+        if(array_of_requests[i]->type !=1 && array_of_requests[i]->type !=2 && array_of_requests[i]->type !=3) 
         {
           printf("Error in request type\n");
@@ -76 +74 @@
         }
         
-        if(array_of_requests[i].type == 2) Request_Check(); 
-        if(array_of_requests[i].type != 2 && finished.at(i) == 0) 
+        if(array_of_requests[i]->type == 2) Request_Check(); 
+        if(array_of_requests[i]->type != 2 && finished.at(i) == 0) 
         {
           finished.at(i) = 1;
-          //mpi_request[i] = static_cast< ::MPI_Request >(array_of_requests[i].mpi_request);
-          mpi_request[i] = *static_cast< ::MPI_Request*>(array_of_requests[i].mpi_request);
+          mpi_request[i] = *static_cast< ::MPI_Request*>(array_of_requests[i]->mpi_request);
         }
       }    
@@ -91 +88 @@
     {
       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;
+      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;
+      
+      array_of_requests[i]->state = 2;
+      
+      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];
     }
 
@@ -99 +102 @@
     delete[] mpi_status;
     
-    
-    return MPI_SUCCESS;
+    return Request_Check();
   }  /* end of mpi_waitall*/