Changeset 511 for XIOS/trunk/src/context_client.cpp

Timestamp:

11/13/14 15:09:28 (10 years ago)

Author:

mhnguyen

Message:

Seperating database of context on "client" side and "server" side

+) Add one more context in contex client in case of attached mode
+) Do some minor changements to make sure everything fine in case of attached mode
+) Replace buffer group with the new options

Test
+) On Curie
+) Connection mode: Attached and seperated
+) File mode: one and multiple
+) All tests passed

File:

• XIOS/trunk/src/context_client.cpp (modified) (4 diffs)

XIOS/trunk/src/context_client.cpp

@@ -17 +17 @@
 
 
-    CContextClient::CContextClient(CContext* parent,MPI_Comm intraComm_, MPI_Comm interComm_) : mapBufferSize_()
+    CContextClient::CContextClient(CContext* parent,MPI_Comm intraComm_, MPI_Comm interComm_, CContext* cxtSer)
+     : mapBufferSize_(), parentServer(cxtSer)
     {
       context=parent ;
@@ -61 +62 @@
       }
 
-      if (context->hasServer) waitEvent(ranks) ;
+//      if (context->hasServer)
+      if (0 != parentServer)
+      {
+        waitEvent(ranks);
+        CContext::setCurrent(context->getId());
+      }
+
       timeLine++ ;
     }
@@ -92 +99 @@
     void CContextClient::waitEvent(list<int>& ranks)
     {
-      context->server->setPendingEvent() ;
+//      context->server->setPendingEvent() ;
+//      while(checkBuffers(ranks))
+//      {
+//        context->server->listen() ;
+//        context->server->checkPendingRequest() ;
+//      }
+//
+//      while(context->server->hasPendingEvent())
+//      {
+//       context->server->eventLoop() ;
+//      }
+
+      parentServer->server->setPendingEvent() ;
       while(checkBuffers(ranks))
       {
-        context->server->listen() ;
-        context->server->checkPendingRequest() ;
-      }
-
-      while(context->server->hasPendingEvent())
-      {
-       context->server->eventLoop() ;
+        parentServer->server->listen() ;
+        parentServer->server->checkPendingRequest() ;
+      }
+
+      while(parentServer->server->hasPendingEvent())
+      {
+       parentServer->server->eventLoop() ;
       }
 
@@ -240 +259 @@
      }
      CTimer::get("Blocking time").suspend();
-     report(0)<< " Memory report : Context <"<<context->getId()<<"> : client side : total memory used for buffer "<<buffers.size()*CXios::bufferSize<<" bytes"<<endl ;
+//     report(0)<< " Memory report : Context <"<<context->getId()<<"> : client side : total memory used for buffer "<<buffers.size()*CXios::bufferSize<<" bytes"<<endl ;
+
+     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()<<"> : client side : memory used for buffer of each connection to server" << endl
+                 << "  +)To server with rank " << itMap->first << " : " << itMap->second << " bytes " << endl;
+       totalBuf += itMap->second;
+     }
+     report(0)<< " Memory report : Context <"<<context->getId()<<"> : client side : total memory used for buffer "<<totalBuf<<" bytes"<<endl ;
 
      releaseBuffers() ;