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

Timestamp:

02/17/17 19:51:36 (7 years ago)

Author:

oabramkina

Message:

dev: intermediate commit.

File:

• XIOS/dev/dev_olga/src/context_server.cpp (modified) (10 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_)
@@ -29 +30 @@
     MPI_Comm_size(intraComm,&intraCommSize);
     MPI_Comm_rank(intraComm,&intraCommRank);
+
     interComm=interComm_;
     int flag;
@@ -38 +40 @@
     scheduled=false;
     finished=false;
-
     boost::hash<string> hashString;
     hashId=hashString(context->getId());
-
-  }
-
-//  CContextServer::CContextServer(CContext* parent, int srvLvl, MPI_Comm intraComm_,MPI_Comm interComm_)
-//  {
-//    context=parent;
-//    intraComm=intraComm_;
-//    MPI_Comm_size(intraComm,&intraCommSize);
-//    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);
-//
-//    currentTimeLine=0;
-//    scheduled=false;
-//    finished=false;
-//
-//    boost::hash<string> hashString;
-//    StdString contextId = context->getId();
-//    hashId=hashString(contextId);
-//
-//  }
+  }
+
   void CContextServer::setPendingEvent(void)
   {
@@ -70 +49 @@
   }
 
+
   bool CContextServer::hasPendingEvent(void)
   {
@@ -80 +60 @@
   }
 
-  bool CContextServer::eventLoop(void)
+  bool CContextServer::eventLoop(bool enableEventsProcessing /*= true*/)
   {
     listen();
     checkPendingRequest();
-    processEvents();
+    if (enableEventsProcessing)
+      processEvents();
     return finished;
   }
@@ -188 +169 @@
     map<size_t,CEventServer*>::iterator it;
     CEventServer* event;
+    boost::hash<string> hashString;
+    size_t hashId=hashString(context->getId());
 
     it=events.find(currentTimeLine);
@@ -224 +207 @@
   {
     map<int,CServerBuffer*>::iterator it;
-    for(it=buffers.begin();it!=buffers.end();++it) delete it->second;
-  }
-
+    for(it=buffers.begin();it!=buffers.end();++it)
+      delete it->second;
+  }
 
   void CContextServer::dispatchEvent(CEventServer& event)
@@ -235 +218 @@
     int rank;
     list<CEventServer::SSubEvent>::iterator it;
-    CContext::setCurrent(context->getId());
+//    CContext::setCurrent(context->getId());
+    StdString ctxId = context->getId();
+    CContext::setCurrent(ctxId);
 
     if (event.classId==CContext::GetType() && event.type==CContext::EVENT_ID_CONTEXT_FINALIZE)
@@ -243 +228 @@
       std::map<int, StdSize>::const_iterator itbMap = mapBufferSize_.begin(),
                            iteMap = mapBufferSize_.end(), itMap;
-      StdSize totalBuf = 0;
       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;
-        totalBuf += itMap->second;
+        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;
       }
       context->finalize();
-      report(0)<< " Memory report : Context <"<<context->getId()<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl;
+
+//      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);
@@ -274 +260 @@
     }
   }
+
+  size_t CContextServer::getTotalBuf(void)
+  {
+    return totalBuf_;
+  }
+
 }