Changeset 1130 for XIOS/dev/dev_olga/src/context_server.cpp

Timestamp:

05/15/17 15:00:24 (7 years ago)

Author:

oabramkina

Message:

Two-level server: merging new grid functionalities and changes in the communication protocol (e.g. non-blocking context finalize, registries, oasis).

Tests on curie: test_client, test_complete, nemo (test_xios2_cmip6.exe).

To do: non-structured grid, check reading, possible bug in client/server initialization (?).

File:

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

XIOS/dev/dev_olga/src/context_server.cpp

@@ -22 +22 @@
 namespace xios
 {
-  StdSize CContextServer::totalBuf_ = 0;
 
   CContextServer::CContextServer(CContext* parent, MPI_Comm intraComm_,MPI_Comm interComm_)
@@ -41 +40 @@
     finished=false;
     boost::hash<string> hashString;
-    hashId=hashString(context->getId());
+    if (CServer::serverLevel == 1)
+      hashId=hashString(context->getId() + boost::lexical_cast<string>(context->clientPrimServer.size()));
+    else
+      hashId=hashString(context->getId());
   }
 
@@ -169 +171 @@
     map<size_t,CEventServer*>::iterator it;
     CEventServer* event;
-    boost::hash<string> hashString;
-    size_t hashId=hashString(context->getId());
 
     it=events.find(currentTimeLine);
@@ -189 +189 @@
          // 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) MPI_Barrier(intraComm) ;
+         if (!CServer::eventScheduler && CXios::isServer) MPI_Barrier(intraComm) ;
 
          CTimer::get("Process events").resume();
@@ -218 +218 @@
     int rank;
     list<CEventServer::SSubEvent>::iterator it;
-//    CContext::setCurrent(context->getId());
     StdString ctxId = context->getId();
     CContext::setCurrent(ctxId);
+    StdSize totalBuf = 0;
 
     if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_FINALIZE)
     {
       finished=true;
-//      info(20)<<"Server Side context <"<<context->getId()<<"> finalized"<<endl;            // moved to CContext::finalize()
+//      info(20)<<"Server Side context <"<<context->getId()<<"> finalized"<<endl;   // moved to CContext::finalize()
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                            iteMap = mapBufferSize_.end(), itMap;
@@ -231 +231 @@
       {
         rank = itMap->first;
-//        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;
+        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;
       }
       context->finalize();
-
-//      report(0)<< " Memory report : Context <"<<ctxId<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl; // moved to CContext::finalize()
+      report(0)<< " Memory report : Context <"<<ctxId<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
     }
     else if (event.classId==CContext::GetType()) CContext::dispatchEvent(event);
@@ -261 +260 @@
   }
 
-  size_t CContextServer::getTotalBuf(void)
-  {
-    return totalBuf_;
-  }
-
 }