Changeset 1021 for XIOS/dev/dev_olga/src/object_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/object_template_impl.hpp (modified) (10 diffs)

XIOS/dev/dev_olga/src/object_template_impl.hpp

@@ -164 +164 @@
    std::map<int, size_t> CObjectTemplate<T>::getMinimumBufferSizeForAttributes()
    {
-     // CContextClient* client = CContext::getCurrent()->client;
+     // Use correct context client to send message
      CContext* context = CContext::getCurrent();
-
-          // 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)
@@ -244 +241 @@
 
    template<typename T>
-   void CObjectTemplate<T>::sendAllAttributesToServer(const int srvPool)
+   void CObjectTemplate<T>::sendAllAttributesToServer(CContextClient* client)
    {
      CAttributeMap& attrMap = *this;
@@ -250 +247 @@
      for (; it != itE; ++it)
      {
-       if (!(it->second)->isEmpty()) sendAttributToServer(*(it->second), srvPool);
+       if (!(it->second)->isEmpty()) sendAttributToServer(*(it->second), client);
      }
    }
@@ -263 +260 @@
 
    template <class T>
-   void CObjectTemplate<T>::sendAttributToServer(const string& id, const int srvPool)
+   void CObjectTemplate<T>::sendAttributToServer(const string& id, CContextClient* client)
    {
       CAttributeMap & attrMap = *this;
       CAttribute* attr=attrMap[id];
-      sendAttributToServer(*attr, srvPool);
+      sendAttributToServer(*attr, client);
    }
 
@@ -273 +270 @@
   void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr)
   {
+     // Use correct context client to send message
     CContext* context=CContext::getCurrent();
-
-     // Use correct context client to send message
-//    CContextClient* contextClientTmp = (0 != context->clientPrimServer) ? context->clientPrimServer : context->client;
     if (context->hasClient)
     {
@@ -283 +278 @@
       {
         CContextClient* contextClientTmp = (context->hasServer) ? context->clientPrimServer[i] : context->client;
-        // CContextClient* contextClientTmp=context->contextClientTmp;
-
         CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE);
         if (contextClientTmp->isServerLeader())
         {
           CMessage msg;
-//          if (context->hasServer)
-//          {
-//            StdString tmp = this->getIdServer() + "_" +boost::lexical_cast<string>(i);
-//            msg<<tmp;
-//          }
-//          else
-            msg<<this->getIdServer();
-
+          msg<<this->getIdServer();
           msg << attr.getName();
           msg << attr;
@@ -331 +317 @@
 
   template <class T>
-  void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr, const int srvPool)
+  void CObjectTemplate<T>::sendAttributToServer(CAttribute& attr, CContextClient* client)
   {
-    CContext* context=CContext::getCurrent();
-    CContextClient* contextClientTmp = context->clientPrimServer[srvPool];
     CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE);
-    if (contextClientTmp->isServerLeader())
+    if (client->isServerLeader())
     {
       CMessage msg;
@@ -342 +326 @@
       msg << attr.getName();
       msg << attr;
-      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);
   }
-
 
   /*!
@@ -364 +347 @@
     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)
@@ -387 +369 @@
 
   template<class T>
-  void CObjectTemplate<T>::sendAddItem(const StdString& id, int itemType, const int srvPool)
+  void CObjectTemplate<T>::sendAddItem(const StdString& id, int itemType, CContextClient* client)
   {
-    CContext* context = CContext::getCurrent();
     typedef typename T::EEventId ItemType;
-     CContextClient* contextClientTmp = context->clientPrimServer[srvPool];
      CEventClient event(this->getType(),ItemType(itemType));
-     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 T>