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

Timestamp:

11/10/16 13:29:57 (7 years ago)

Author:

mhnguyen

Message:

First working version.
There are more things to do with it

File:

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

XIOS/dev/dev_olga/src/group_template_impl.hpp

@@ -373 +373 @@
    void CGroupTemplate<U, V, W>::sendCreateChild(const string& id)
    {
-    CContext* context=CContext::getCurrent() ;
-    
-    if (! context->hasServer )
+    CContext* context=CContext::getCurrent() ;  
+
+    if (context->hasClient)
+    // if (!context->hasServer )
     {
-       CContextClient* client=context->client ;
+      // Use correct context client to send message
+       CContextClient* contextClientTmp = (0 != context->clientPrimServer) ? context->clientPrimServer : context->client;
 
        CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD) ;   
-       if (client->isServerLeader())
+       if (contextClientTmp->isServerLeader())
        {
          CMessage msg ;
          msg<<this->getId() ;
          msg<<id ;
-         const std::list<int>& ranks = client->getRanksServerLeader();
+         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) ;
-         client->sendEvent(event) ;
+         contextClientTmp->sendEvent(event) ;
        }
-       else client->sendEvent(event) ;
+       else contextClientTmp->sendEvent(event) ;
     }
+
+    // if (! context->hasServer )
+    // {
+    //    CContextClient* client=context->client ;
+
+    //    CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD) ;   
+    //    if (client->isServerLeader())
+    //    {
+    //      CMessage msg ;
+    //      msg<<this->getId() ;
+    //      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) ;
+    // }
       
    }
@@ -399 +419 @@
    {
     CContext* context=CContext::getCurrent() ;
-    if (! context->hasServer )
+
+        // if (! context->hasServer )
+    if (context->hasClient)
     {
-       CContextClient* client=context->client ;
+        // Use correct context client to send message
+       CContextClient* contextClientTmp = (0 != context->clientPrimServer) ? context->clientPrimServer : context->client;
 
        CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD_GROUP) ;   
-       if (client->isServerLeader())
+       if (contextClientTmp->isServerLeader())
        {
          CMessage msg ;
          msg<<this->getId() ;
          msg<<id ;
-         const std::list<int>& ranks = client->getRanksServerLeader();
+         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) ;
-         client->sendEvent(event) ;
+         contextClientTmp->sendEvent(event) ;
        }
-       else client->sendEvent(event) ;
+       else contextClientTmp->sendEvent(event) ;
     }
+
+    // if (! context->hasServer )
+    // {
+    //    CContextClient* client=context->client ;
+
+    //    CEventClient event(this->getType(),EVENT_ID_CREATE_CHILD_GROUP) ;   
+    //    if (client->isServerLeader())
+    //    {
+    //      CMessage msg ;
+    //      msg<<this->getId() ;
+    //      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) ;
+    // }
       
    }