Changeset 1527 for XIOS/dev/branch_openmp/extern/ep_dev/ep_probe.cpp

Timestamp:

06/08/18 15:59:53 (6 years ago)

Author:

yushan

Message:

save dev

File:

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

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

@@ -8 +8 @@
   int MPI_Iprobe_mpi(int src, int tag, MPI_Comm comm, int *flag, MPI_Status *status)
   {
+    ::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);
+
+    status->mpi_status = new ::MPI_Status(mpi_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_Improbe_mpi(int src, int tag, MPI_Comm comm, int *flag, MPI_Message *message, MPI_Status *status)
+  {
+    ::MPI_Status mpi_status;
+    ::MPI_Message mpi_message;
+
+    #ifdef _openmpi
+    #pragma omp critical (_mpi_call)
+    {
+      ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_status);
+      if(*flag)
+      {
+        ::MPI_Mprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), &mpi_message, &mpi_status);
+      }
+    }
+    #elif _intelmpi
+    ::MPI_Improbe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_message, &mpi_status);
+    #endif
+      
+    status->mpi_status = new ::MPI_Status(mpi_status);
+    status->ep_src = src;
+    status->ep_tag = tag;
+
+    (*message)->mpi_message = &message;
+    (*message)->ep_src = src;
+    (*message)->ep_tag = tag;
+  }
+
+
+
 
   int MPI_Iprobe(int src, int tag, MPI_Comm comm, int *flag, MPI_Status *status)
@@ -24 +59 @@
     {
       Debug("MPI_Iprobe with EP\n");
-      
+
       *flag = false;
     
@@ -53 +88 @@
   }
 
+  
+
 
 
@@ -63 +100 @@
     {
       Debug("calling MPI_Improbe MPI\n");
-
-      ::MPI_Status mpi_status;
-      ::MPI_Message mpi_message;
-
-      #ifdef _openmpi
-      #pragma omp critical (_mpi_call)
-      {
-        ::MPI_Iprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_status);
-        if(*flag)
-        {
-          ::MPI_Mprobe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), &mpi_message, &mpi_status);
-        }
-      }
-      #elif _intelmpi
-        ::MPI_Improbe(src<0? MPI_ANY_SOURCE : src, tag<0? MPI_ANY_TAG: tag, to_mpi_comm(comm->mpi_comm), flag, &mpi_message, &mpi_status);
-      #endif
-        
-      status->mpi_status = &mpi_status;
-      status->ep_src = src;
-      status->ep_tag = tag;
-
-      (*message)->mpi_message = &message;
-      (*message)->ep_src = src;
-      (*message)->ep_tag = tag;
-      
-      
-      return 0;
-    }
-
-   
+      return MPI_Improbe_mpi(src, tag, comm, flag, message, status);
+    } 
 
     #pragma omp flush