Changeset 509 for XIOS/trunk/src/object_template_impl.hpp

Timestamp:

11/13/14 15:09:14 (9 years ago)

Author:

mhnguyen

Message:

Implementing buffer size auto-detection for mode client -server

+) Process xml tree in client side then send all the information to server
+) Only information enabled fields in enabled files are sent to server
+) Some important change in structure of code which must be refactored

Test
+) On Curie
+) Only mode client-server
+) Passed for all tests

File:

• XIOS/trunk/src/object_template_impl.hpp (modified) (22 diffs)

XIOS/trunk/src/object_template_impl.hpp

@@ -55 +55 @@
       ERROR("CObjectTemplate<T> construtor 3", << "Not completly implemented yet !");
    }
-   
+
    template <class T>
       CObjectTemplate<T>::~CObjectTemplate(void)
@@ -65 +65 @@
       std::vector<boost::shared_ptr<T> > &
          CObjectTemplate<T>::GetAllVectobject(const StdString & contextId)
-   { 
-      return (CObjectTemplate<T>::AllVectObj[contextId]); 
-   }
-   
-   //---------------------------------------------------------------
-   
+   {
+      return (CObjectTemplate<T>::AllVectObj[contextId]);
+   }
+
+   //---------------------------------------------------------------
+
    template <class T>
       StdString CObjectTemplate<T>::toString(void) const
@@ -84 +84 @@
    template <class T>
       void CObjectTemplate<T>::fromString(const StdString & str)
-   { 
+   {
       ERROR("CObjectTemplate<T>::fromString(str)",
-            << "[ str = " << str << "] Not implemented yet !"); 
-   }
-   
-   //---------------------------------------------------------------
-
-/*   
+            << "[ str = " << str << "] Not implemented yet !");
+   }
+
+   //---------------------------------------------------------------
+
+/*
    template <class T>
       void CObjectTemplate<T>::toBinary(StdOStream & os) const
    {
-      SuperClassMap::toBinary(os);    
-   }
-      
+      SuperClassMap::toBinary(os);
+   }
+
    template <class T>
       void CObjectTemplate<T>::fromBinary(StdIStream & is)
    {
-      SuperClassMap::fromBinary(is); 
+      SuperClassMap::fromBinary(is);
    }
 */
@@ -121 +121 @@
       return (T::GetType());
    }
-  
+
    template <class T>
    string CObjectTemplate<T>::getName(void) const
@@ -127 +127 @@
       return (T::GetName());
    }
-  
+
    //---------------------------------------------------------------
 
    template <class T>
       bool CObjectTemplate<T>::hasChild(void) const
-   { 
-      return (false); 
+   {
+      return (false);
    }
 
@@ -140 +140 @@
    template <class T>
       void CObjectTemplate<T>::solveDescInheritance(bool apply, const CAttributeMap * const parent)
-   { 
-      SuperClassMap::setAttributes(parent, apply); 
+   {
+      SuperClassMap::setAttributes(parent, apply);
    }
 
@@ -160 +160 @@
    }
 
+   template<typename T>
+   void CObjectTemplate<T>::sendAllAttributesToServer()
+   {
+     CAttributeMap& attrMap = *this;
+     CAttributeMap::const_iterator it = attrMap.begin(), itE = attrMap.end();
+     for (; it != itE; ++it)
+     {
+       if (!(it->second)->isEmpty()) sendAttributToServer(*(it->second));
+     }
+
+   }
+
    template <class T>
    void CObjectTemplate<T>::sendAttributToServer(const string& id)
@@ -172 +184 @@
   {
     CContext* context=CContext::getCurrent() ;
-    
+
     if (!context->hasServer)
     {
        CContextClient* client=context->client ;
 
-       CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE) ;   
+       CEventClient event(getType(),EVENT_ID_SEND_ATTRIBUTE) ;
        if (client->isServerLeader())
        {
@@ -189 +201 @@
        else client->sendEvent(event) ;
     }
-      
+
   }
-   
+
   template <class T>
   void CObjectTemplate<T>::recvAttributFromClient(CEventServer& event)
   {
-      
+
     CBufferIn* buffer=event.subEvents.begin()->buffer;
     string id,attrId;
@@ -220 +232 @@
            return true ;
            break ;
-       
+
          default :
          return false ;
@@ -227 +239 @@
       }
    }
-   
+
    template <typename T>
    bool CObjectTemplate<T>::has(const string & id)
@@ -251 +263 @@
      return CObjectFactory::GetObject<T>(ptr).get() ;
    }
-   
+
    template <typename T>
    shared_ptr<T> CObjectTemplate<T>::getShared(const T* ptr)
@@ -263 +275 @@
      return CObjectFactory::GetObject<T>((T*)this) ;
    }
-   
+
    template <typename T>
    const vector<T*> CObjectTemplate<T>::getAll()
@@ -269 +281 @@
      const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>();
      vector<T*> vect ;
-    
+
      typename vector<shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get()) ;
@@ -280 +292 @@
      const vector< shared_ptr<T> >& shared_vect= CObjectFactory::GetObjectVector<T>(id);
      vector<T*> vect ;
-    
+
      typename vector<shared_ptr<T> >::const_iterator it;
      for(it=shared_vect.begin();it!=shared_vect.end();++it) vect.push_back(it->get()) ;
@@ -303 +315 @@
     return CObjectFactory::GetObject<T>((T*)this).get() ;
   }
-  
+
    template <typename T>
    void CObjectTemplate<T>::generateCInterface(ostream& oss)
@@ -310 +322 @@
      int found=className.find_first_of("_") ;
      if (found!=string::npos) className.replace(found,1,0,'x') ;
-     
+
      oss<<"/* ************************************************************************** *"<<iendl ;
      oss<<" *               Interface auto generated - do not modify                   *"<<iendl ;
@@ -340 +352 @@
      int found=className.find_first_of("_") ;
      if (found!=string::npos) className.replace(found,1,0,'x') ;
-     
+
      oss<<"! * ************************************************************************** *"<<iendl ;
      oss<<"! *               Interface auto generated - do not modify                     *"<<iendl ;
@@ -349 +361 @@
      oss<<iendl ;
      oss<<"INTERFACE ! Do not call directly / interface FORTRAN 2003 <-> C99"<<iendl++ ;
-     oss<<iendl ;   
+     oss<<iendl ;
      oss<<iendl ;
      SuperClassMap::generateFortran2003Interface(oss,className) ;
@@ -356 +368 @@
      oss<<"END MODULE "<<className<<"_interface_attr"<<iendl ;
    }
-  
+
    template <typename T>
    void CObjectTemplate<T>::generateFortranInterface(ostream& oss)
@@ -366 +378 @@
      found=superClassName.find("_group") ;
      if (found!=string::npos) superClassName.erase(found,6) ;
-     
+
      oss<<"! * ************************************************************************** *"<<iendl ;
      oss<<"! *               Interface auto generated - do not modify                     *"<<iendl ;
@@ -398 +410 @@
      SuperClassMap::generateFortranInterfaceIsDefined_hdl(oss,className) ;
      oss<<iendl ;
-     SuperClassMap::generateFortranInterfaceIsDefined_hdl_(oss,className) ;     
+     SuperClassMap::generateFortranInterfaceIsDefined_hdl_(oss,className) ;
      oss<<iendl-- ;
      oss<<"END MODULE i"<<className<<"_attr"<<iendl ;