Changeset 2019 for XIOS/dev/dev_trunk_graph/src/group_template_impl.hpp

Timestamp:

01/22/21 12:00:29 (3 years ago)

Author:

yushan

Message:

Graph intermedia commit to a tmp branch

File:

• XIOS/dev/dev_trunk_graph/src/group_template_impl.hpp (modified) (3 diffs)

XIOS/dev/dev_trunk_graph/src/group_template_impl.hpp

@@ -369 +369 @@
   }
 
-
-   template <class U, class V, class W>
-   void CGroupTemplate<U, V, W>::sendCreateChild(const string& id)
-   {
-    CContext* context=CContext::getCurrent() ;  
-
-    if (context->hasClient)
-    // if (!context->hasServer )
-    {
-      // Use correct context client to send message
-//      CContextClient* contextClientTmp = (0 != context->clientPrimServer) ? context->clientPrimServer : context->client;
-      int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
-      for (int i = 0; i < nbSrvPools; ++i)
-      {
-         CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i] : context->client;
-
-         CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD) ;
-         if (contextClientTmp->isServerLeader())
-         {
-           CMessage msg ;
-           msg<<this->getId() ;
-           msg<<id ;
-           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) ;
-      }
-    }
-      
-   }
-
-   template <class U, class V, class W>
-   void CGroupTemplate<U, V, W>::sendCreateChild(const string& id, CContextClient* client)
+   template <class U, class V, class W>
+   void CGroupTemplate<U, V, W>::sendCreateChild(const string& id, CContextClient* client, const string& objectId)
    {
 
@@ -410 +377 @@
     {
       CMessage msg ;
-      msg<<this->getId() ;
+      if (objectId.empty()) msg << this->getId();
+      else msg << objectId;
       msg<<id ;
       const std::list<int>& ranks = client->getRanksServerLeader();
@@ -420 +388 @@
    }
 
-
-   template <class U, class V, class W>
-   void CGroupTemplate<U, V, W>::sendCreateChildGroup(const string& id)
-   {
-    CContext* context=CContext::getCurrent() ;
-    if (context->hasClient)
-    {
-      // Use correct context client to send message
-      // int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
-      int nbSrvPools = (context->hasServer) ? (context->hasClient ? context->clientPrimServer.size() : 1) : 1;
-      for (int i = 0; i < nbSrvPools; ++i)
-      {
-        CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i] : context->client;
-        CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD_GROUP) ;
-        if (contextClientTmp->isServerLeader())
-        {
-          CMessage msg ;
-          msg<<this->getId() ;
-          msg<<id ;
-          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) ;
-      }
-    }
-   }
-   
+   template <class U, class V, class W>
+   void CGroupTemplate<U, V, W>::sendCreateChildGroup(const string& id, CContextClient* client, const string& objectId)
+   {
+     CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD_GROUP) ;
+     if (client->isServerLeader())
+     {
+       CMessage msg ;
+       if (objectId.empty()) msg << this->getId();
+       else msg << objectId;
+       msg<<id ;
+       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) ;
+   }   
+
+
    template <class U, class V, class W>
    void CGroupTemplate<U, V, W>::recvCreateChild(CEventServer& event)