Changeset 1601 for XIOS/dev/dev_trunk_omp/src/context_server.cpp

Timestamp:

11/19/18 15:52:54 (5 years ago)

Author:

yushan

Message:

branch_openmp merged with trunk r1597

File:

• XIOS/dev/dev_trunk_omp/src/context_server.cpp (modified) (7 diffs)

XIOS/dev/dev_trunk_omp/src/context_server.cpp

@@ -18 +18 @@
 #include <boost/functional/hash.hpp>
 
-
+using namespace ep_lib;
 
 namespace xios
@@ -81 +81 @@
 
     traceOff();
-    MPI_Iprobe(MPI_ANY_SOURCE, 20,interComm,&flag,&status);
+    MPI_Iprobe(-2, 20,interComm,&flag,&status);
     traceOn();
 
     if (flag==true)
     {
+      #ifdef _usingMPI
       rank=status.MPI_SOURCE ;
+      #elif _usingEP
+      rank=status.ep_src ;
+      #endif
       okLoop = true;
       if (pendingRequest.find(rank)==pendingRequest.end())
@@ -112 +116 @@
     char * addr;
     map<int,CServerBuffer*>::iterator it;
+    #ifdef _usingMPI
     int rank=status.MPI_SOURCE ;
+    #elif _usingEP
+    int rank=status.ep_src;
+    #endif    
 
     it=buffers.find(rank);
@@ -118 +126 @@
     {
        StdSize buffSize = 0;
-       MPI_Recv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &status);
+       MPI_Request request;
+       
+       MPI_Irecv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &request);
+       MPI_Wait(&request, &status);
        mapBufferSize_.insert(std::make_pair(rank, buffSize));
        it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first;
@@ -132 +143 @@
          bufferRequest[rank]=addr;
          return true;
-       }
+      }
       else
         return false;
@@ -253 +264 @@
     {
       finished=true;
+      #pragma omp critical (_output)
       info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
       context->finalize();
@@ -260 +272 @@
       {
         rank = itMap->first;
+        #pragma omp critical (_output)
         report(10)<< " Memory report : Context <"<<ctxId<<"> : server side : memory used for buffer of each connection to client" << endl
             << "  +) With client of rank " << rank << " : " << itMap->second << " bytes " << endl;
         totalBuf += itMap->second;
       }
+      #pragma omp critical (_output)
       report(0)<< " Memory report : Context <"<<ctxId<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
     }