Changeset 2209 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Timestamp:

08/25/21 19:31:05 (3 years ago)

Author:

ymipsl

Message:

Revisiting registry management and make it working.
YM

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• context.cpp (modified) (5 diffs)
• context.hpp (modified) (3 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.cpp

@@ -428 +428 @@
 
       string contextRegistryId=getId() ;
-      registryIn=new CRegistry(intraComm);
+      registryIn=new CRegistry(CXios::getRegistryManager()->getRegistryIn());
       registryIn->setPath(contextRegistryId) ;
       
-      int commRank ;
-      MPI_Comm_rank(intraComm_,&commRank) ;
-      if (commRank==0) registryIn->fromFile("xios_registry.bin") ;
-      registryIn->bcastRegistry() ;
       registryOut=new CRegistry(intraComm_) ;
       registryOut->setPath(contextRegistryId) ;
@@ -465 +461 @@
      CXios::getContextsManager()->getContextId(getId(), contextId_, intraComm) ;
      
-     registryIn=new CRegistry(intraComm);
-     registryIn->setPath(contextId_) ;
-     
-     int commRank ;
-     MPI_Comm_rank(intraComm_,&commRank) ;
-     if (commRank==0) registryIn->fromFile("xios_registry.bin") ;
-    
-     registryIn->bcastRegistry() ;
-     registryOut=new CRegistry(intraComm) ;
-     registryOut->setPath(contextId_) ;
+     string contextRegistryId=getId() ;
+     registryIn=new CRegistry(CXios::getRegistryManager()->getRegistryIn());
+     registryIn->setPath(contextRegistryId) ;
+      
+     registryOut=new CRegistry(intraComm_) ;
+     registryOut->setPath(contextRegistryId) ;
 
    }
@@ -715 +707 @@
    {
       registryOut->hierarchicalGatherRegistry() ;
-      if (server->intraCommRank==0) CXios::globalRegistry->mergeRegistry(*registryOut) ;
+      if (server->intraCommRank==0) CXios::getRegistryManager()->merge(*registryOut) ;
 
       if (serviceType_==CServicesManager::CLIENT)
@@ -1574 +1566 @@
              return true;
              break;
-           case EVENT_ID_SEND_REGISTRY:
-             recvRegistry(event);
-             return true;
-             break;
            case EVENT_ID_COUPLER_IN_READY:
              recvCouplerInReady(event);
@@ -2106 +2094 @@
   CATCH
 
-     //! Server side: Receive a message to do some post processing
-  void CContext::recvRegistry(CEventServer& event)
-  TRY
-  {
-    CBufferIn* buffer=event.subEvents.begin()->buffer;
-    getCurrent()->recvRegistry(*buffer);
-  }
-  CATCH
-
-  void CContext::recvRegistry(CBufferIn& buffer)
-  TRY
-  {
-    if (server->intraCommRank==0)
-    {
-      CRegistry registry(server->intraComm) ;
-      registry.fromBuffer(buffer) ;
-      registryOut->mergeRegistry(registry) ;
-    }
-  }
-  CATCH_DUMP_ATTR
-
-  void CContext::sendRegistry(void)
-  TRY
-  {
-    registryOut->hierarchicalGatherRegistry() ;
-
-    int nbSrvPools ;
-    if (serviceType_==CServicesManager::CLIENT) nbSrvPools = 1 ;
-    else if (serviceType_==CServicesManager::GATHERER) nbSrvPools = this->clientPrimServer.size() ;
-    else nbSrvPools = 0 ;
-    CContextClient* contextClientTmp ;
-
-    for (int i = 0; i < nbSrvPools; ++i)
-    {
-      if (serviceType_==CServicesManager::CLIENT) contextClientTmp = client ;
-      else if (serviceType_==CServicesManager::GATHERER ) contextClientTmp = clientPrimServer[i] ;
-
-      CEventClient event(CContext::GetType(), CContext::EVENT_ID_SEND_REGISTRY);
-      if (contextClientTmp->isServerLeader())
-      {
-        CMessage msg ;
-        if (contextClientTmp->clientRank==0) msg<<*registryOut ;
-        const std::list<int>& ranks = contextClientTmp->getRanksServerLeader();
-        for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-             event.push(*itRank,1,msg);
-        contextClientTmp->sendEvent(event);
-      }
-      else contextClientTmp->sendEvent(event);
-    }
-  }
-  CATCH_DUMP_ATTR
-
   
   void CContext::sendFinalizeClient(CContextClient* contextClient, const string& contextClientId)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/context.hpp

@@ -55 +55 @@
            EVENT_ID_CLOSE_DEFINITION,EVENT_ID_UPDATE_CALENDAR,
            EVENT_ID_CREATE_FILE_HEADER,EVENT_ID_CONTEXT_FINALIZE,
-           EVENT_ID_SEND_REGISTRY,
            EVENT_ID_CONTEXT_FINALIZE_CLIENT,
            EVENT_ID_COUPLER_IN_READY,
@@ -170 +169 @@
          void sendRefDomainsAxisScalars(const std::vector<CFile*>& activeFiles);
          //!< after be gathered to the root process of the context, merged registry is sent to the root process of the servers
-         void sendRegistry(void) ;
          void sendFinalizeClient(CContextClient* contextClient, const string& contextClientId);
          
@@ -189 +187 @@
          static void recvSolveInheritanceContext(CEventServer& event);
          void recvSolveInheritanceContext(CBufferIn& buffer);
-         static void recvRegistry(CEventServer& event) ;
-         void recvRegistry(CBufferIn& buffer) ; //!< registry is received by the servers
          static void recvFinalizeClient(CEventServer& event) ;
          void recvFinalizeClient(CBufferIn& buffer);