Changeset 1158 for XIOS/dev/dev_olga/src/object_template_impl.hpp

Timestamp:

06/06/17 17:58:16 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging with trunk r1137.
There are bugs.

File:

• XIOS/dev/dev_olga/src/object_template_impl.hpp (modified) (4 diffs)

XIOS/dev/dev_olga/src/object_template_impl.hpp

@@ -136 +136 @@
    }
 
+   /*!
+     Compare two object of same type
+   */
+   template <class T>
+   bool CObjectTemplate<T>::isEqual(const string& id, const vector<StdString>& excludedAttrs)
+   {
+      T* obj = CObjectTemplate<T>::get(id);
+      return this->isEqual(obj, excludedAttrs);
+   }
+
+   template <class T>
+   bool CObjectTemplate<T>::isEqual(T* obj, const vector<StdString>& excludedAttrs)
+   {
+
+      CAttributeMap& attrMapThis = *this;
+      CAttributeMap& attrMapObj  = *obj;
+      return (attrMapThis.isEqual(attrMapObj, excludedAttrs));
+   }
+
    //---------------------------------------------------------------
 
@@ -199 +218 @@
          }
        }
-
-     // if (client->isServerLeader())
-     // {
-     //   size_t minimumSize = 0;
-     //   CAttributeMap& attrMap = *this;
-     //   CAttributeMap::const_iterator it = attrMap.begin(), itE = attrMap.end();
-     //   for (; it != itE; ++it)
-     //   {
-     //     if (!it->second->isEmpty())
-     //     {
-     //       size_t size = it->second->getName().size() + sizeof(size_t) + it->second->size();
-     //       if (size > minimumSize)
-     //         minimumSize = size;
-     //     }
-     //   }
-
-     //   if (minimumSize)
-     //   {
-     //     // Account for extra header info
-     //     minimumSize += CEventClient::headerSize + getIdServer().size() + sizeof(size_t);
-
-     //     const std::list<int>& ranks = client->getRanksServerLeader();
-     //     for (std::list<int>::const_iterator itRank = ranks.begin(), itRankEnd = ranks.end(); itRank != itRankEnd; ++itRank)
-     //       minimumSizes.insert(std::make_pair(*itRank, minimumSize));
-     //   }
-     // }
-
        return minimumSizes;
      }
@@ -257 +249 @@
       CAttributeMap & attrMap = *this;
       CAttribute* attr=attrMap[id];
-      if (attr->doSend()) 
-        sendAttributToServer(*attr);
+      sendAttributToServer(*attr);
    }
 
@@ -369 +360 @@
   }
 
-
   template <class T>
   void CObjectTemplate<T>::recvAttributFromClient(CEventServer& event)