Changeset 1021 for XIOS/dev/dev_olga/src/group_template_impl.hpp

Timestamp:

01/10/17 14:36:29 (7 years ago)

Author:

oabramkina

Message:

Intermeadiate version for merging with new server functionalities.

File:

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

XIOS/dev/dev_olga/src/group_template_impl.hpp

@@ -8 +8 @@
 #include "context.hpp"
 #include "event_client.hpp"
-#include "context_client.hpp"
 #include "message.hpp"
 #include "type.hpp"
@@ -419 +418 @@
       
    }
-   
-   template <class U, class V, class W>
-   void CGroupTemplate<U, V, W>::sendCreateChild(const string& id, const int srvPool)
-   {
-    CContext* context=CContext::getCurrent() ;
-    CContextClient* contextClientTmp = context->clientPrimServer[srvPool];
+
+   template <class U, class V, class W>
+   void CGroupTemplate<U, V, W>::sendCreateChild(const string& id, CContextClient* client)
+   {
 
     CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD) ;
-    if (contextClientTmp->isServerLeader())
+    if (client->isServerLeader())
     {
       CMessage msg ;
       msg<<this->getId() ;
       msg<<id ;
-      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)
        event.push(*itRank,1,msg) ;
-      contextClientTmp->sendEvent(event) ;
+      client->sendEvent(event) ;
     }
-    else contextClientTmp->sendEvent(event) ;
-   }
+    else client->sendEvent(event) ;
+   }
+
 
    template <class U, class V, class W>
@@ -444 +442 @@
    {
     CContext* context=CContext::getCurrent() ;
-
-        // if (! context->hasServer )
     if (context->hasClient)
     {
-        // Use correct context client to send message
-//      CContextClient* contextClientTmp = (0 != context->clientPrimServer) ? context->clientPrimServer : context->client;
+      // Use correct context client to send message
       int nbSrvPools = (context->hasServer) ? context->clientPrimServer.size() : 1;
       for (int i = 0; i < nbSrvPools; ++i)