Changeset 511 for XIOS/trunk/src/client.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/client.cpp (modified) (5 diffs)

XIOS/trunk/src/client.cpp

@@ -132 +132 @@
         CTimer::get("XIOS").resume() ;
         CTimer::get("XIOS init").resume() ;
-  
-        if (CXios::usingServer) 
+
+        if (CXios::usingServer)
         {
           MPI_Status status ;
@@ -153 +153 @@
     {
       CContext::setCurrent(id) ;
-      CContext* context=CContext::create(id) ;
+      CContext* context=CContext::create(id);
+      StdString idServer(id);
+      idServer += "_server";
 
       if (!CXios::isServer)
@@ -169 +171 @@
 
         CMessage msg ;
-        msg<<id<<size<<globalRank ;
+        msg<<idServer<<size<<globalRank ;
+//        msg<<id<<size<<globalRank ;
 
         int messageSize=msg.size() ;
@@ -192 +195 @@
         MPI_Comm contextInterComm ;
         MPI_Comm_dup(contextComm,&contextInterComm) ;
-        context->initClient(contextComm,contextInterComm) ;
-        context->initServer(contextComm,contextInterComm) ;
+        CContext* contextServer = CContext::create(idServer);
+
+        // Firstly, initialize context on client side
+        context->initClient(contextComm,contextInterComm, contextServer);
+
+
+        // Secondly, initialize context on server side
+        contextServer->initServer(contextComm,contextInterComm);
+
+        // Finally, we should return current context to context client
+        CContext::setCurrent(id);
+//        context->initServer(contextComm,contextInterComm) ;
       }
     }
@@ -223 +236 @@
       report(0)<< " Performance report : Ratio : "<< CTimer::get("Blocking time").getCumulatedTime()/CTimer::get("XIOS").getCumulatedTime()*100.<<" %"<<endl ;
       report(0)<< " Performance report : This ratio must be close to zero. Otherwise it may be usefull to increase buffer size or numbers of server"<<endl ;
-      report(0)<< " Memory report : Current buffer_size : "<<CXios::bufferSize<<endl ;
-      report(0)<< " Memory report : Minimum buffer size required : "<<maxRequestSize*2<<endl ;
+//      report(0)<< " Memory report : Current buffer_size : "<<CXios::bufferSize<<endl ;
+      report(0)<< " Memory report : Minimum buffer size required : "<<maxRequestSize*2<< " bytes" << endl ;
       report(0)<< " Memory report : increasing it by a factor will increase performance, depending of the volume of data wrote in file at each time step of the file"<<endl ;
    }