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

Timestamp:

11/13/14 15:09:28 (9 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_server.cpp (modified) (2 diffs)

XIOS/trunk/src/context_server.cpp

@@ -83 +83 @@
             StdSize buffSize = 0;
             MPI_Recv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &status);
+            mapBufferSize_.insert(std::make_pair(rank, buffSize));
             it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first ;
           }
@@ -207 +208 @@
     {
       info(20)<<"Server Side context <"<<context->getId()<<"> finalized"<<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()<<"> : 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;
+      }
       context->finalize() ;
       finished=true ;
-      report(0)<< " Memory report : Context <"<<context->getId()<<"> : server side : total memory used for buffer "<<buffers.size()*CXios::bufferSize<<" bytes"<<endl ;
+      report(0)<< " Memory report : Context <"<<context->getId()<<"> : server side : total memory used for buffer "<<totalBuf<<" bytes"<<endl ;
     }
     else if (event.classId==CContext::GetType()) CContext::dispatchEvent(event) ;