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

Timestamp:

03/22/18 10:43:20 (6 years ago)

Author:

yushan

Message:

branch_openmp merged with XIOS_DEV_CMIP6@1459

File:

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

XIOS/dev/branch_openmp/src/context_server.cpp

@@ -29 +29 @@
     MPI_Comm_size(intraComm,&intraCommSize);
     MPI_Comm_rank(intraComm,&intraCommRank);
+
     interComm=interComm_;
     int flag;
@@ -34 +35 @@
     if (flag) MPI_Comm_remote_size(interComm,&commSize);
     else  MPI_Comm_size(interComm,&commSize);
+
     currentTimeLine=0;
     scheduled=false;
     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());
+  }
+
   void CContextServer::setPendingEvent(void)
   {
@@ -142 +146 @@
   }
 
+
   void CContextServer::checkPendingRequest(void)
   {
@@ -182 +187 @@
     map<size_t,CEventServer*>::iterator it;
 
+    CTimer::get("Process request").resume();
     while(count>0)
     {
@@ -195 +201 @@
       count=buffer.remain();
     }
-
+    CTimer::get("Process request").suspend();
   }
 
@@ -241 +247 @@
   }
 
-
   void CContextServer::dispatchEvent(CEventServer& event)
   {
@@ -249 +254 @@
     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)
@@ -255 +262 @@
       finished=true;
       #pragma omp critical (_output)
-      info(20)<<"Server Side context <"<<context->getId()<<"> finalized"<<endl;
+      info(20)<<" CContextServer: Receive context <"<<context->getId()<<"> finalize."<<endl;
+      context->finalize();
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
-                                             iteMap = mapBufferSize_.end(), itMap;
-      StdSize totalBuf = 0;
+                           iteMap = mapBufferSize_.end(), itMap;
       for (itMap = itbMap; itMap != iteMap; ++itMap)
       {
-        //report(10)<< " Memory report : Context <"<<context->getId()<<"> : server side : memory used for buffer of each connection to client" << endl
-        //          << "  +) With client of rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
+        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;
       }
-      context->finalize();
-      //report(0)<< " Memory report : Context <"<<context->getId()<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
+      #pragma omp critical (_output)
+      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);