Changeset 1522 for XIOS/dev/branch_openmp/extern/ep_dev/ep_probe.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_probe.cpp (modified) (2 diffs)

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

@@ -6 +6 @@
 namespace ep_lib
 {
+  int MPI_Iprobe_mpi(int src, int tag, MPI_Comm comm, int *flag, MPI_Status *status)
+  {
+    status->ep_src = src;
+    status->ep_tag = tag;
+    return ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, to_mpi_status_ptr(*status));
+  }
 
   int MPI_Iprobe(int src, int tag, MPI_Comm comm, int *flag, MPI_Status *status)
   {
-    *flag = false;
-
     if(!comm->is_ep)
     {
-      Debug("calling MPI_Iprobe MPI\n");
-      ::MPI_Status mpi_status;
-      ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_status);
+      Debug("MPI_Iprobe with MPI\n");
+      return MPI_Iprobe_mpi(src, tag, comm, flag, status);
+    }
+    
+    else
+    {
+      Debug("MPI_Iprobe with EP\n");
+      
+      *flag = false;
+    
+      Message_Check(comm);
 
-      status->mpi_status = &mpi_status;
-      status->ep_src = src;
-      status->ep_tag = tag;
-      return 0;
-    }
+      #pragma omp flush
 
-    Debug("calling MPI_Iprobe EP\n");
-    Message_Check(comm);
-
-    #pragma omp flush
-
-    #pragma omp critical (_query)
-    if(!comm->ep_comm_ptr->message_queue->empty())
-    {
+      #pragma omp critical (_query)
       for(Message_list::iterator it = comm->ep_comm_ptr->message_queue->begin(); it!= comm->ep_comm_ptr->message_queue->end(); ++it)
       {
@@ -39 +40 @@
         {
           Debug("find message\n");
-          *flag = true;
+          
 
-          ::MPI_Status mpi_status = *(static_cast< ::MPI_Status *>((*it)->mpi_status));
-
-          status->mpi_status = (*it)->mpi_status;
+          status->mpi_status = new ::MPI_Status(*static_cast< ::MPI_Status*>((*it)->mpi_status));
           status->ep_src = (*it)->ep_src;
           status->ep_tag = (*it)->ep_tag;
 
+          *flag = true;
           break;
         }
       }
     }
-
-    return 0;
   }