Changeset 697

Timestamp:

09/18/15 12:01:48 (9 years ago)

Author:

ymipsl

Message:

Implement registryIn and registryOut functionnalities.
YM

Location:

XIOS/trunk/src

Files:

• client.cpp (modified) (2 diffs)
• context_client.cpp (modified) (4 diffs)
• context_client.hpp (modified) (2 diffs)
• context_server.hpp (modified) (1 diff)
• cxios.cpp (modified) (6 diffs)
• cxios.hpp (modified) (2 diffs)
• node/context.cpp (modified) (7 diffs)
• node/context.hpp (modified) (5 diffs)
• server.cpp (modified) (2 diffs)
• server.hpp (modified) (2 diffs)

XIOS/trunk/src/client.cpp

@@ -220 +220 @@
       int rank ;
       int msg=0 ;
+
+      MPI_Comm_rank(intraComm,&rank) ;
+ 
       if (!CXios::isServer)
       {
@@ -242 +245 @@
         else MPI_Finalize() ;
       }
+      
       info(20) << "Client side context is finalized"<<endl ;
       report(0) <<" Performance report : total time spent for XIOS : "<< CTimer::get("XIOS").getCumulatedTime()<<" s"<<endl ;

XIOS/trunk/src/context_client.cpp

@@ -6 +6 @@
 #include "buffer_client.hpp"
 #include "type.hpp"
-#include "message.hpp"
 #include "event_client.hpp"
 #include "context.hpp"
@@ -71 +70 @@
 
       timeLine = 0;
+
     }
 
+     
     /*!
     In case of attached mode, the current context must be reset to context for client
@@ -287 +288 @@
   }
 
+ 
+
    /*!
    Finalize context client and do some reports
    */
+    
    void CContextClient::finalize(void)
    {
      map<int,CClientBuffer*>::iterator itBuff;
      bool stop = true;
-
+      
      CEventClient event(CContext::GetType(), CContext::EVENT_ID_CONTEXT_FINALIZE);
      if (isServerLeader())
@@ -327 +331 @@
 
      releaseBuffers();
+     
    }
 }

XIOS/trunk/src/context_client.hpp

@@ -4 +4 @@
 #include "xios_spl.hpp"
 #include "buffer_out.hpp"
+#include "buffer_in.hpp"
 #include "buffer_client.hpp"
 #include "event_client.hpp"
+#include "event_server.hpp"
 #include "mpi.hpp"
+#include "registry.hpp"
 
 namespace xios
@@ -46 +49 @@
       void setBufferSize(const std::map<int,StdSize>& mapSize);
       void sendBufferSizeEvent();
-
     public:
       CContext* context; //!< Context for client

XIOS/trunk/src/context_server.hpp

@@ -39 +39 @@
     size_t currentTimeLine ;
     CContext* context ;
-
+      
     bool finished ;
     bool pendingEvent ;

XIOS/trunk/src/cxios.cpp

@@ -10 +10 @@
 #include <new>
 #include "memtrack.hpp"
+#include "registry.hpp"
 
 namespace xios
@@ -27 +28 @@
   bool CXios::printLogs2Files;
   bool CXios::isOptPerformance = true;
+  CRegistry* CXios::globalRegistry = 0;
 
   //! Parse configuration file and create some objects from it
@@ -75 +77 @@
 
     CClient::initialize(codeId,localComm,returnComm) ;
+    if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
 
     if (usingServer) isServer=false;
@@ -95 +98 @@
      CClient::finalize() ;
      CClient::closeInfoStream();
+     if (CClient::getRank()==0)
+     {
+       info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
+       globalRegistry->toFile("xios_registry.bin") ;
+       delete globalRegistry ;
+     }
 
 #ifdef XIOS_MEMTRACK
@@ -121 +130 @@
     // Initialize all aspects MPI
     CServer::initialize();
-
+    if (CServer::getRank()==0) globalRegistry = new CRegistry(CServer::intraComm) ;
+    
     if (printLogs2Files)
     {
@@ -137 +147 @@
 
     // Finalize
+     if (CServer::getRank()==0)
+     {
+       info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
+       globalRegistry->toFile("xios_registry.bin") ;
+       delete globalRegistry ;
+     }
     CServer::finalize();
     CServer::closeInfoStream();

XIOS/trunk/src/cxios.hpp

@@ -4 +4 @@
 #include "xios_spl.hpp"
 #include "mpi.hpp"
+#include "registry.hpp"
 
 namespace xios
@@ -42 +43 @@
      static double defaultBufferServerFactorSize ; //!< Default factor value
      static bool isOptPerformance; //!< Check if buffer size is for performance (as large as possible)
+     static CRegistry* globalRegistry ; //!< global registry which is wrote by the root process of the servers
 
     public:

XIOS/trunk/src/node/context.cpp

@@ -14 +14 @@
 #include "type.hpp"
 #include "xios_spl.hpp"
+
 
 namespace xios {
@@ -239 +240 @@
      hasClient=true;
      client = new CContextClient(this,intraComm, interComm, cxtServer);
+     registryIn=new CRegistry(intraComm);
+     registryIn->setPath(getId()) ;
+     if (client->clientRank==0) registryIn->fromFile("xios_registry.bin") ;
+     registryIn->bcastRegistry() ;
+
+     registryOut=new CRegistry(intraComm) ;
+     registryOut->setPath(getId()) ;
+
      MPI_Comm intraCommServer, interCommServer;
      if (cxtServer) // Attached mode
@@ -296 +305 @@
      hasServer=true;
      server = new CContextServer(this,intraComm,interComm);
+
+     registryIn=new CRegistry(intraComm);
+     registryIn->setPath(getId()) ;
+     if (server->intraCommRank==0) registryIn->fromFile("xios_registry.bin") ;
+     registryIn->bcastRegistry() ;
+     registryOut=new CRegistry(intraComm) ;
+     registryOut->setPath(getId()) ;
+ 
      MPI_Comm intraCommClient, interCommClient;
      if (cxtClient) // Attached mode
@@ -331 +348 @@
       {
         finalized = true;
-
+        if (hasClient) sendRegistry() ;
         client->finalize();
         while (!server->hasFinished())
@@ -341 +358 @@
         {
           closeAllFile();
+          registryOut->hierarchicalGatherRegistry() ;
+          if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
         }
-
+        
         for (std::list<MPI_Comm>::iterator it = comms.begin(); it != comms.end(); ++it)
           MPI_Comm_free(&(*it));
@@ -576 +595 @@
              recvPostProcessing(event);
              return true;
-             break;
+            case EVENT_ID_SEND_REGISTRY:
+             recvRegistry(event);
+             return true;
+            break;
 
            default :
@@ -1018 +1040 @@
     return (context);
   }
+
+
+
+     //! Server side: Receive a message to do some post processing
+  void CContext::recvRegistry(CEventServer& event)
+  {
+    CBufferIn* buffer=event.subEvents.begin()->buffer;
+    string id;
+    *buffer>>id;
+    get(id)->recvRegistry(*buffer);
+  }
+
+  void CContext::recvRegistry(CBufferIn& buffer)
+  {
+    if (server->intraCommRank==0)
+    {
+      CRegistry registry(server->intraComm) ;
+      registry.fromBuffer(buffer) ;
+      registryOut->mergeRegistry(registry) ;
+    }
+  }
+
+  void CContext::sendRegistry(void)
+  {
+    registryOut->hierarchicalGatherRegistry() ;
+
+    CEventClient event(CContext::GetType(), CContext::EVENT_ID_SEND_REGISTRY);
+    if (client->isServerLeader())
+    {
+       CMessage msg ;
+       msg<<this->getIdServer();
+       if (client->clientRank==0) msg<<*registryOut ;
+       const std::list<int>& ranks = client->getRanksServerLeader();
+       for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
+         event.push(*itRank,1,msg);
+       client->sendEvent(event);
+     }
+     else client->sendEvent(event);
+  }
+
 } // namespace xios

XIOS/trunk/src/node/context.hpp

@@ -12 +12 @@
 #include "data_output.hpp"
 #include "garbage_collector.hpp"
-
+#include "registry.hpp"
 #include "mpi.hpp"
 
@@ -51 +51 @@
            EVENT_ID_CLOSE_DEFINITION,EVENT_ID_UPDATE_CALENDAR,
            EVENT_ID_CREATE_FILE_HEADER,EVENT_ID_CONTEXT_FINALIZE,
-           EVENT_ID_POST_PROCESS
+           EVENT_ID_POST_PROCESS, EVENT_ID_SEND_REGISTRY
          };
 
@@ -132 +132 @@
          void sendRefGrid();
          void sendPostProcessing();
-
+         void sendRegistry(void) ; //!< after be gathered to the root process of the context, merged registry is sent to the root process of the servers
          const StdString& getIdServer();
 
@@ -145 +145 @@
          static void recvPostProcessing(CEventServer& event);
          void recvPostProcessing(CBufferIn& buffer);
+         static void recvRegistry(CEventServer& event) ;
+         void recvRegistry(CBufferIn& buffer) ; //!< registry is received by the root process of the servers
 
          // dispatch event
@@ -213 +215 @@
          // Concrete contex client
          CContextClient* client;
-
+         CRegistry* registryIn ;  //!< input registry which is read from file 
+         CRegistry* registryOut ; //!< output registry which will be wrote on file at the finalize
+         
       private:
          bool isPostProcessed;

XIOS/trunk/src/server.cpp

@@ -27 +27 @@
     bool CServer::is_MPI_Initialized ;
     CEventScheduler* CServer::eventScheduler = 0;
-
+   
     void CServer::initialize(void)
     {
@@ -148 +148 @@
     {
       CTimer::get("XIOS").suspend() ;
-
+     
       delete eventScheduler ;
 

XIOS/trunk/src/server.hpp

@@ -4 +4 @@
 #include "xios_spl.hpp"
 #include "context.hpp"
+#include "context_client.hpp"
 #include "mpi.hpp"
 #include "event_scheduler.hpp"
@@ -27 +28 @@
         static std::list<MPI_Comm> contextInterComms;
         static CEventScheduler* eventScheduler;
-
+        
         struct contextMessage
         {