Changeset 1345 for XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

Timestamp:

11/24/17 15:13:47 (6 years ago)

Author:

oabramkina

Message:

In addition to r1294: all domain/axis attributes are only sent to secondary-server pools that need them (and not to all pools).

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp (modified) (8 diffs)

XIOS/dev/XIOS_DEV_CMIP6/src/node/axis.cpp

@@ -26 +26 @@
       , transformationMap_(), hasValue(false), hasLabel(false)
       , computedWrittenIndex_(false)
+          , clients()
    {
    }
@@ -37 +38 @@
       , transformationMap_(), hasValue(false), hasLabel(false)
       , computedWrittenIndex_(false)
+          , clients()
    {
    }
@@ -839 +841 @@
                                         CServerDistributionDescription::ServerDistributionType distType)
   {
-    CContext* context = CContext::getCurrent();
-
-    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 0) : 1;
-    for (int i = 0; i < nbSrvPools; ++i)
-    {
-      CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i]
-                                                                         : context->client;
-      int nbServer = contextClientTmp->serverSize;
+    std::set<CContextClient*>::iterator it;
+    for (it=clients.begin(); it!=clients.end(); ++it)
+    {
+      CContextClient* client = *it;
+      int nbServer = client->serverSize;
 
       CServerDistributionDescription serverDescription(globalDim, nbServer);
@@ -855 +854 @@
 
       CEventClient event(getType(),EVENT_ID_DISTRIBUTION_ATTRIBUTE);
-      if (contextClientTmp->isServerLeader())
+      if (client->isServerLeader())
       {
         std::list<CMessage> msgs;
 
-        const std::list<int>& ranks = contextClientTmp->getRanksServerLeader();
+        const std::list<int>& ranks = client->getRanksServerLeader();
         for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
         {
@@ -875 +874 @@
           event.push(*itRank,1,msg);
         }
-        contextClientTmp->sendEvent(event);
-      }
-      else contextClientTmp->sendEvent(event);
+        client->sendEvent(event);
+      }
+      else client->sendEvent(event);
     }
   }
@@ -960 +959 @@
   void CAxis::sendNonDistributedAttributes()
   {
-    CContext* context = CContext::getCurrent();
-
-    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-      CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[p] : context->client;
+    std::set<CContextClient*>::iterator it;
+    for (it=clients.begin(); it!=clients.end(); ++it)
+        {
+          CContextClient* client = *it;
 
       CEventClient event(getType(), EVENT_ID_NON_DISTRIBUTED_ATTRIBUTES);
@@ -1086 +1083 @@
   {
     int ns, n, i, j, ind, nv, idx;
-    CContext* context = CContext::getCurrent();
-    
-    int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
-    for (int p = 0; p < nbSrvPools; ++p)
-    {
-      CContextClient* client = (0 != context->clientPrimServer.size()) ? context->clientPrimServer[p] : context->client;
+    std::set<CContextClient*>::iterator it;
+
+    for (it=clients.begin(); it!=clients.end(); ++it)
+    {
+      CContextClient* client = *it;
       int nbServer = client->serverSize;
 
@@ -1442 +1438 @@
   }
 
+  void CAxis::setContextClient(CContextClient* contextClient)
+  {
+    clients.insert(contextClient);
+  }
+
   void CAxis::parse(xml::CXMLNode & node)
   {