Changeset 1522 for XIOS/dev/branch_openmp/extern/ep_dev/ep_wait.cpp

Timestamp:

06/05/18 19:14:40 (6 years ago)

Author:

yushan

Message:

Test_client 6*8 clients 2 servers OK. TO DO : intercomm->intracomm, comm_free_intercomm

File:

• XIOS/dev/branch_openmp/extern/ep_dev/ep_wait.cpp (modified) (5 diffs)

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

@@ -25 +25 @@
     if((*request)->type !=1 && (*request)->type !=2 && (*request)->type !=3) 
     {
-      printf("Error in request type\n");
+      printf("MPI_Wait : Error in request type\n");
  
       exit(1);
@@ -32 +32 @@
     while((*request)->type == 2) Request_Check();
     
-    ::MPI_Wait(to_mpi_request_ptr(*request), to_mpi_status_ptr(status));
+    ::MPI_Status mpi_status;
+    
+    ::MPI_Wait(to_mpi_request_ptr(*request), &mpi_status);
 
-    
+    status->mpi_status = new ::MPI_Status(mpi_status);
     status->ep_src = (*request)->ep_src;
     status->ep_tag = (*request)->ep_tag;
@@ -42 +44 @@
 
     memcheck("delete "<< (*request)->mpi_request << " : in ep_lib::MPI_Wait, delete (*request)->mpi_request");
+
     delete (*request)->mpi_request;
-    Request_Check();
-
-    return MPI_SUCCESS;
+    delete *request;
+    *request=0;
+    
+    return Request_Check();
 
   }   /*end of mpi_wait*/
@@ -86 +90 @@
     for(int i=0; i<count; i++)
     {
-      array_of_statuses[i].mpi_status = &mpi_status[i];
+      array_of_statuses[i].mpi_status = new ::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_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;
-      if(array_of_requests[i]->type == 1) 
-      {
-        memcheck("delete "<< array_of_requests[i] <<" : in ep_lib::MPI_Waitall, array_of_requests["<<i<<"]");
-        delete array_of_requests[i];
-      }
+      delete array_of_requests[i];
+      array_of_requests[i] = 0;
     }
 
@@ -103 +106 @@
     delete[] mpi_status;
     
-    Request_Check();
-    
-    
-    return MPI_SUCCESS;
+    return Request_Check();
   }  /* end of mpi_waitall*/