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

Timestamp:

11/13/14 15:09:14 (9 years ago)

Author:

mhnguyen

Message:

Implementing buffer size auto-detection for mode client -server

+) Process xml tree in client side then send all the information to server
+) Only information enabled fields in enabled files are sent to server
+) Some important change in structure of code which must be refactored

Test
+) On Curie
+) Only mode client-server
+) Passed for all tests

File:

• XIOS/trunk/src/context_server.cpp (modified) (3 diffs)

XIOS/trunk/src/context_server.cpp

@@ -37 +37 @@
     scheduled=false ;
     finished=false ;
-    
+
     boost::hash<string> hashString ;
     hashId=hashString(context->getId()) ;
@@ -80 +80 @@
           it=buffers.find(rank) ;
           if (it==buffers.end())
-            it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer))).first ;
-          MPI_Get_count(&status,MPI_CHAR,&count) ;
-          if (it->second->isBufferFree(count))
           {
-            addr=(char*)it->second->getBuffer(count) ;
-            MPI_Irecv(addr,count,MPI_CHAR,rank,20,interComm,&pendingRequest[rank]) ;
-            bufferRequest[rank]=addr ;
+            StdSize buffSize = 0;
+            MPI_Recv(&buffSize, 1, MPI_LONG, rank, 20, interComm, &status);
+            it=(buffers.insert(pair<int,CServerBuffer*>(rank,new CServerBuffer(buffSize)))).first ;
+          }
+          else
+          {
+            MPI_Get_count(&status,MPI_CHAR,&count) ;
+            if (it->second->isBufferFree(count))
+            {
+              addr=(char*)it->second->getBuffer(count) ;
+              MPI_Irecv(addr,count,MPI_CHAR,rank,20,interComm,&pendingRequest[rank]) ;
+              bufferRequest[rank]=addr ;
+            }
           }
         }
@@ -158 +165 @@
     {
       event=it->second ;
-      
+
       if (event->isFull())
       {
         if (!scheduled && !CXios::isServer)
         {
-          CServer::eventScheduler->registerEvent(currentTimeLine,hashId) ;  
+          CServer::eventScheduler->registerEvent(currentTimeLine,hashId) ;
           scheduled=true ;
         }
-        else if (CXios::isServer || CServer::eventScheduler->queryEvent(currentTimeLine,hashId) ) 
+        else if (CXios::isServer || CServer::eventScheduler->queryEvent(currentTimeLine,hashId) )
         {
          CTimer::get("Process events").resume() ;