Changeset 1642 for XIOS/dev/branch_openmp/src/context_server.cpp

Timestamp:

01/23/19 10:31:44 (5 years ago)

Author:

yushan

Message:

dev on ADA. add flag switch _usingEP/_usingMPI

File:

• XIOS/dev/branch_openmp/src/context_server.cpp (modified) (13 diffs)

XIOS/dev/branch_openmp/src/context_server.cpp

@@ -18 +18 @@
 #include <boost/functional/hash.hpp>
 
-using namespace ep_lib;
+
 
 namespace xios
 {
 
-  CContextServer::CContextServer(CContext* parent,MPI_Comm intraComm_,MPI_Comm interComm_)
+  CContextServer::CContextServer(CContext* parent,ep_lib::MPI_Comm intraComm_,ep_lib::MPI_Comm interComm_)
   {
     context=parent;
     intraComm=intraComm_;
-    MPI_Comm_size(intraComm,&intraCommSize);
-    MPI_Comm_rank(intraComm,&intraCommRank);
+    ep_lib::MPI_Comm_size(intraComm,&intraCommSize);
+    ep_lib::MPI_Comm_rank(intraComm,&intraCommRank);
 
     interComm=interComm_;
     int flag;
-    MPI_Comm_test_inter(interComm,&flag);
-    if (flag) MPI_Comm_remote_size(interComm,&commSize);
-    else  MPI_Comm_size(interComm,&commSize);
+    ep_lib::MPI_Comm_test_inter(interComm,&flag);
+    if (flag) ep_lib::MPI_Comm_remote_size(interComm,&commSize);
+    else  ep_lib::MPI_Comm_size(interComm,&commSize);
 
     currentTimeLine=0;
@@ -76 +76 @@
     int count;
     char * addr;
-    MPI_Status status;
+    ep_lib::MPI_Status status;
     map<int,CServerBuffer*>::iterator it;
     bool okLoop;
 
     traceOff();
-    MPI_Iprobe(-2, 20,interComm,&flag,&status);
+    #ifdef _usingMPI
+    MPI_Iprobe(MPI_ANY_SOURCE, 20,interComm,&flag,&status);
+    #elif _usingEP
+    ep_lib::MPI_Iprobe(-2, 20,interComm,&flag,&status);
+    #endif
     traceOn();
 
@@ -102 +106 @@
 
             traceOff();
-            MPI_Iprobe(rank, 20,interComm,&flag,&status);
+            ep_lib::MPI_Iprobe(rank, 20,interComm,&flag,&status);
             traceOn();
             if (flag==true) listenPendingRequest(status) ;
@@ -111 +115 @@
   }
 
-  bool CContextServer::listenPendingRequest(MPI_Status& status)
+  bool CContextServer::listenPendingRequest(ep_lib::MPI_Status& status)
   {
     int count;
@@ -119 +123 @@
     int rank=status.MPI_SOURCE ;
     #elif _usingEP
-    int rank=status.ep_src;
-    #endif    
+    int rank=status.ep_src ;
+    #endif
 
     it=buffers.find(rank);
@@ -126 +130 @@
     {
        StdSize buffSize = 0;
-       MPI_Request request;
-       
-       MPI_Irecv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &request);
-       MPI_Wait(&request, &status);
+       ep_lib::MPI_Recv(&buffSize, 1, EP_LONG, rank, 20, interComm, &status);
        mapBufferSize_.insert(std::make_pair(rank, buffSize));
        it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first;
@@ -136 +137 @@
     else
     {
-      MPI_Get_count(&status,MPI_CHAR,&count);
+      ep_lib::MPI_Get_count(&status,EP_CHAR,&count);
       if (it->second->isBufferFree(count))
       {
          addr=(char*)it->second->getBuffer(count);
-         MPI_Irecv(addr,count,MPI_CHAR,rank,20,interComm,&pendingRequest[rank]);
+         ep_lib::MPI_Irecv(addr,count,EP_CHAR,rank,20,interComm,&pendingRequest[rank]);
          bufferRequest[rank]=addr;
          return true;
-      }
+       }
       else
         return false;
@@ -152 +153 @@
   void CContextServer::checkPendingRequest(void)
   {
-    map<int,MPI_Request>::iterator it;
+    map<int,ep_lib::MPI_Request>::iterator it;
     list<int> recvRequest;
     list<int>::iterator itRecv;
@@ -158 +159 @@
     int flag;
     int count;
-    MPI_Status status;
+    ep_lib::MPI_Status status;
 
     for(it=pendingRequest.begin();it!=pendingRequest.end();it++)
@@ -164 +165 @@
       rank=it->first;
       traceOff();
-      MPI_Test(& it->second, &flag, &status);
+      ep_lib::MPI_Test(& it->second, &flag, &status);
       traceOn();
       if (flag==true)
       {
         recvRequest.push_back(rank);
-        MPI_Get_count(&status,MPI_CHAR,&count);
+        ep_lib::MPI_Get_count(&status,EP_CHAR,&count);
         processRequest(rank,bufferRequest[rank],count);
       }
@@ -229 +230 @@
          // The best way to properly solve this problem will be to use the event scheduler also in attached mode
          // for now just set up a MPI barrier
-         if (!CServer::eventScheduler && CXios::isServer) MPI_Barrier(intraComm) ;
+         if (!CServer::eventScheduler && CXios::isServer) ep_lib::MPI_Barrier(intraComm) ;
 
          CTimer::get("Process events").resume();
@@ -264 +265 @@
     {
       finished=true;
-      #pragma omp critical (_output)
       info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
       context->finalize();
@@ -272 +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;
     }