Changeset 799 for XIOS/branchs

Timestamp:

11/27/15 09:55:05 (8 years ago)

Author:

rlacroix

Message:

Add registry

Location:

XIOS/branchs/xios-1.0/src

Files:

• buffer_in.cpp (modified) (2 diffs)
• buffer_in.hpp (modified) (1 diff)
• buffer_out.cpp (modified) (2 diffs)
• buffer_out.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)
• registry.cpp (added)
• registry.hpp (added)

XIOS/branchs/xios-1.0/src/buffer_in.cpp

@@ -20 +20 @@
     {
       own=false ;
-      realloc(0,0) ;      
+      size_=0 ;
     }
 
@@ -52 +52 @@
     }
 
-    size_t CBufferIn::size(void)
+    size_t CBufferIn::bufferSize(void)
     {
       return size_ ;

XIOS/branchs/xios-1.0/src/buffer_in.hpp

@@ -42 +42 @@
 
       void* ptr(void) ;
+      void* start(void) { return begin ; }
 
       
       size_t remain(void) ;
       size_t count(void) ;                          
-      size_t size(void) ;                         
+      size_t bufferSize(void) ;
       ~CBufferIn() ;
 

XIOS/branchs/xios-1.0/src/buffer_out.cpp

@@ -14 +14 @@
     {
       own=false ;
-      realloc(0,0) ;      
+      size_=0 ;
     }
 
@@ -57 +57 @@
     }
 
-    size_t CBufferOut::size(void)
+    size_t CBufferOut::bufferSize(void)
     {
       return size_ ;

XIOS/branchs/xios-1.0/src/buffer_out.hpp

@@ -44 +44 @@
       
       void* ptr(void) ;
+      void* start(void) { return begin ; }
             
       size_t remain(void) ;
       size_t count(void) ;
-      size_t size(void) ;
+      size_t bufferSize(void) ;
                             
       ~CBufferOut() ;

XIOS/branchs/xios-1.0/src/cxios.cpp

@@ -10 +10 @@
 #include <new>
 #include "memtrack.hpp"
+#include "registry.hpp"
 
 namespace xios
@@ -28 +29 @@
   double CXios::defaultBufferServerFactorSize=2 ;
   bool CXios::printLogs2Files;
+  CRegistry* CXios::globalRegistry = 0;
 
 
@@ -52 +54 @@
 
     CClient::initialize(codeId,localComm,returnComm) ;
+    if (CClient::getRank()==0) globalRegistry = new CRegistry(returnComm) ;
 
     if (usingServer) isServer=false;
@@ -71 +74 @@
   {
      CClient::finalize() ;
+     if (CClient::getRank()==0)
+     {
+       info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
+       globalRegistry->toFile("xios_registry.bin") ;
+       delete globalRegistry ;
+     }
      CClient::closeInfoStream();
 
@@ -89 +98 @@
     // Initialize all aspects MPI
     CServer::initialize();
+    if (CServer::getRank()==0) globalRegistry = new CRegistry(CServer::intraComm) ;
 
     if (printLogs2Files)
@@ -106 +116 @@
     // Finalize
     CServer::finalize();
+    if (CServer::getRank()==0)
+    {
+      info(80)<<"Write data base Registry"<<endl<<globalRegistry->toString()<<endl ;
+      globalRegistry->toFile("xios_registry.bin") ;
+      delete globalRegistry ;
+    }
     CServer::closeInfoStream();
   }

XIOS/branchs/xios-1.0/src/cxios.hpp

@@ -4 +4 @@
 #include "xmlioserver_spl.hpp"
 #include "mpi.hpp"
+#include "registry.hpp"
 
 namespace xios
@@ -42 +43 @@
      static double bufferServerFactorSize ;
      static double defaultBufferServerFactorSize ;
+     static CRegistry* globalRegistry ; //!< global registry which is written by the root process of the servers
 
      public:

XIOS/branchs/xios-1.0/src/node/context.cpp

@@ -7 +7 @@
 #include "duration.hpp"
 
+#include "cxios.hpp"
 #include "context_client.hpp"
 #include "context_server.hpp"
@@ -268 +269 @@
      hasClient=true ;
      client = new CContextClient(this,intraComm, interComm) ;
+     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()) ;
    } 
 
@@ -279 +287 @@
      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()) ;
    } 
 
@@ -290 +304 @@
       if (hasClient && !hasServer)
       {
+         if (hasClient) sendRegistry() ;
          client->finalize() ;
       }
@@ -295 +310 @@
       {
         closeAllFile() ;
+        registryOut->hierarchicalGatherRegistry() ;
+        if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
       }
    }
@@ -429 +446 @@
              return true ;
              break ;
+           case EVENT_ID_SEND_REGISTRY:
+            recvRegistry(event);
+            return true;
+           break;
            default :
              ERROR("bool CContext::dispatchEvent(CEventServer& event)",
@@ -564 +585 @@
     return (context);
   }
+
+  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->getId();
+       if (client->clientRank==0) msg<<*registryOut ;
+       event.push(client->getServerLeader(),1,msg);
+       client->sendEvent(event);
+     }
+     else client->sendEvent(event);
+  }
 } // namespace xios

XIOS/branchs/xios-1.0/src/node/context.hpp

@@ -13 +13 @@
 
 #include "mpi.hpp"
+
+#include "registry.hpp"
 
 
@@ -42 +44 @@
          {
            EVENT_ID_CLOSE_DEFINITION,EVENT_ID_UPDATE_CALENDAR,
-           EVENT_ID_CREATE_FILE_HEADER,EVENT_ID_CONTEXT_FINALIZE
+           EVENT_ID_CREATE_FILE_HEADER,EVENT_ID_CONTEXT_FINALIZE,
+           EVENT_ID_SEND_REGISTRY
          } ;
          
@@ -125 +128 @@
          void sendUpdateCalendar(int step) ;
          void sendCreateFileHeader(void) ;
+         void sendRegistry(void) ; //!< after be gathered to the root process of the context, merged registry is sent to the root process of the servers
          static void recvUpdateCalendar(CEventServer& event) ;
          void recvUpdateCalendar(CBufferIn& buffer) ;
@@ -130 +134 @@
          static void recvCreateFileHeader(CEventServer& event) ;
          void recvCreateFileHeader(CBufferIn& buffer) ;
+         static void recvRegistry(CEventServer& event) ;
+         void recvRegistry(CBufferIn& buffer) ; //!< registry is received by the root process of the servers
          static CContext* getCurrent(void) ;
          static CContextGroup* getRoot(void) ;
@@ -151 +157 @@
          static shared_ptr<CContextGroup> root ;
 
-
+         CRegistry* registryIn ;  //!< input registry which is read from file
+         CRegistry* registryOut ; //!< output registry which will be wrote on file at the finalize
    }; // class CContext