Changeset 1063 for XIOS/dev/branch_yushan/extern/src_ep_dev/ep_barrier.cpp

Timestamp:

02/27/17 14:19:19 (7 years ago)

Author:

yushan

Message:

server mode OK for both multiple and one file mode. Tested with test_client

File:

• XIOS/dev/branch_yushan/extern/src_ep_dev/ep_barrier.cpp (modified) (4 diffs)

XIOS/dev/branch_yushan/extern/src_ep_dev/ep_barrier.cpp

@@ -1 +1 @@
 #include "ep_lib.hpp"
 #include <mpi.h>
-//#include "ep_declaration.hpp"
+#include "ep_declaration.hpp"
 
 namespace ep_lib
 {
 
-
-
   int MPI_Barrier(MPI_Comm comm)
   {
+    if(comm.is_intercomm) return MPI_Barrier_intercomm(comm);
 
     if(comm.is_ep)
@@ -20 +19 @@
       {
         ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm > (comm.mpi_comm);
+
         ::MPI_Barrier(mpi_comm);
       }
@@ -27 +27 @@
       return 0;
     }
-    else if(comm.mpi_comm !=0 )
+    else if(comm.mpi_comm != MPI_COMM_NULL_STD )
     {
       ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm> (comm.mpi_comm);
@@ -37 +37 @@
   }
 
+
+  int MPI_Barrier_intercomm(MPI_Comm comm)
+  {
+
+    int ep_rank_loc = comm.ep_comm_ptr->size_rank_info[1].first;
+
+    MPI_Barrier_local(comm);
+
+    if(ep_rank_loc == 0)
+    {
+      ::MPI_Comm mpi_comm = static_cast< ::MPI_Comm > (comm.ep_comm_ptr->intercomm->mpi_inter_comm);
+      ::MPI_Barrier(mpi_comm);
+    }
+
+    MPI_Barrier_local(comm);
+
+    return 0;
+
+  }
+
+
   int MPI_Barrier_local(MPI_Comm comm)
   {
-    //Message_Check(comm);
+    Message_Check(comm);
     comm.ep_barrier->wait();
   }