Changeset 259

Timestamp:

08/24/11 11:17:45 (12 years ago)

Author:

hozdoba

Message:

Mise à jour v4

Location:

XMLIO_V2/dev/dev_rv

Files:

• Makefile.wk (modified) (1 diff)
• src/xmlio/buffer.cpp (modified) (1 diff)
• src4/xmlio/buffer/buffer.cpp (modified) (2 diffs)
• src4/xmlio/buffer/buffer.hpp (modified) (5 diffs)

XMLIO_V2/dev/dev_rv/Makefile.wk

@@ -411 +411 @@
 ifeq ($(VERSION), 4)
         ELEMS_CPP = object exception xml_node xml_parser inetcdf4 inetcdf4_adv onetcdf4  mpi_interface\
-        attribute attribute_template attribute_map
+        attribute attribute_template attribute_map buffer
                
 endif

XMLIO_V2/dev/dev_rv/src/xmlio/buffer.cpp

@@ -98 +98 @@
       CBuffer::getBufferDataType<ARRAY(type, 1)>(void) const { return (type_enum); };
 
-      BufferDataTypeGetter(bool, TBOOL8);
-      BufferDataTypeGetter(char, TCHAR8);
-      BufferDataTypeGetter(float, TFLOAT32);
-      BufferDataTypeGetter(double, TDOUBLE64);
+      BufferDataTypeGetter(bool,     TBOOL8);
+      BufferDataTypeGetter(char,     TCHAR8);
+      BufferDataTypeGetter(float,    TFLOAT32);
+      BufferDataTypeGetter(double,   TDOUBLE64);
       BufferDataTypeGetter(long int, TINT32);
 

XMLIO_V2/dev/dev_rv/src4/xmlio/buffer/buffer.cpp

@@ -3 +3 @@
  * ************************************************************************** */
  
+#ifndef __XIOS_NO_EXTERN
+
+// C++ standard headers
+#include <fstream>
+
+#endif // __XIOS_NO_EXTERN
+
 // XMLIOServer headers
 #include "buffer.hpp" 
+#include "buffer_impl.hpp" 
 
 // /////////////////////////////// Définitions ////////////////////////////// //
@@ -10 +18 @@
 namespace xmlioserver {
 namespace comm {
-   
-   
+
+   // ------------------------------ Constructeurs -----------------------------
+
+   CBuffer::CBuffer(std::size_t _size)
+      : size(_size), delIdata(true)
+   {
+      this->idata = new char[_size]();
+      //CMPIManager::AllocMem(&idata, size);
+   }
+
+   CBuffer::CBuffer(char * _data, std::size_t _size)
+      : size(_size), delIdata(false)
+   {
+      this->idata = _data;
+   }
+      
+   CBuffer::CBuffer(const CBuffer & _buffer_ref)
+      : size(_buffer_ref.size), delIdata(true)
+   {
+     this->idata = new char[size]();
+     std::copy (_buffer_ref.idata, _buffer_ref.idata+size, this->idata);
+   }
+      
+   CBuffer::CBuffer(const CBuffer * const _buffer_ptr)
+      : size(_buffer_ptr->size), delIdata(true)
+   {
+     this->idata = new char[size]();
+      std::copy (_buffer_ptr->idata, _buffer_ptr->idata+size, this->idata);       
+   }
+
+   // ------------------------------- Destructeur ------------------------------
+   
+   CBuffer::~CBuffer(void)
+   {
+      if (delIdata) delete [] this->idata;
+      else this->fillData('\0', this->getSize(), 0);
+      //CMPIManager::FreeMem(idata);
+   }
+   
+   // ------------------------------- Opérateurs -------------------------------
+   
+   CBuffer::operator char * (void)
+   {
+      return (this->getData()); 
+   }
+
+   char * CBuffer::operator[](std::size_t _position)
+   {
+      return (this->getData(_position)); 
+   }
+   
+   // ------------------------------- Mutateurs --------------------------------
+   
+   void CBuffer::setData(const char * _data, std::size_t _size, std::size_t _position)
+   {
+      if (this->size < (_size + _position))
+         XIOS_ERROR("CBuffer::getData(data, size, position)",
+                    << " Buffer size <  size + position !");
+      std::copy(&(_data[0]), &(_data[size]), this->getData(_position));
+   }
+  
+   void CBuffer::setBufferData(const CBufferData & _bufdata, std::size_t _position)
+   {
+      std::size_t currposition = _position;
+      this->setData( reinterpret_cast<const char*>(&(_bufdata.type))
+                   , sizeof(CBufferDataType), currposition);
+      this->setData( reinterpret_cast<const char*>(&(_bufdata.isArray))
+                   , sizeof(bool), currposition += sizeof(CBufferDataType));
+      this->setData( reinterpret_cast<const char*>(&(_bufdata.size))
+                   , sizeof(std::size_t), currposition += sizeof(bool));
+     this->setData( reinterpret_cast<const char*>(&(_bufdata.pos))
+                   , sizeof(std::size_t), currposition += sizeof(std::size_t));
+   }
+  
+   void CBuffer::updateBufferData(std::size_t _position)
+   {
+      CBufferData bufdata;
+      this->getBufferData(bufdata, _position);
+      bufdata.pos = _position + DATA_HEADER_SIZE;
+      this->setBufferData(bufdata, _position);
+   }
+  
+   void CBuffer::fillData(char _data, std::size_t _size, std::size_t _position)
+   {
+      if (this->size < (_size + _position))
+         XIOS_ERROR("CBuffer::getData(data, size, position)", << " Buffer size <  size + position !");
+      std::fill_n(this->getData(_position), _size, _data);
+   }
+  
+   // ------------------------------- Accesseurs -------------------------------
+   
+   std::size_t CBuffer::getSize(std::size_t _position) const
+   {
+      if (_position > this->size)
+         XIOS_ERROR("CBuffer::getSize(position)", << " Buffer size <  size + position !");
+      return (this->size - _position);
+   }
+
+   char * CBuffer::getData(std::size_t _position) const
+   {
+      if (_position > this->size)
+         XIOS_ERROR("CBuffer::getData(position)", << " Buffer size < position !");
+      return &(this->idata[_position]);
+   }
+   
+   void CBuffer::getData(char * _data, std::size_t _size, std::size_t _position) const
+   {
+      if (this->size < (_size + _position))
+        XIOS_ERROR("CBuffer::getData(data, size, position)", << " Buffer size <  size + position !");
+       std::copy(this->getData(_position), this->getData(_position + _size), _data);
+   }
+   
+   void CBuffer::getBufferData(CBufferData & _bufdata, std::size_t _position) const
+   {
+      std::size_t currposition = _position;
+      this->getData( reinterpret_cast<char*>(&(_bufdata.type))
+                    , sizeof(CBufferDataType), currposition);
+      this->getData( reinterpret_cast<char*>(&(_bufdata.isArray))
+                   , sizeof(bool), currposition += sizeof(CBufferDataType));
+      this->getData( reinterpret_cast<char*>(&(_bufdata.size))
+                   , sizeof(std::size_t), currposition += sizeof(bool));
+      this->getData( reinterpret_cast<char*>(&(_bufdata.pos))
+                   , sizeof(std::size_t), currposition += sizeof(std::size_t));
+   }
+  
+   std::size_t CBuffer::getNextDataPosition(std::size_t _position)
+   {
+      CBufferData  bufdata;
+      this->updateBufferData(_position);
+      this->getBufferData(bufdata, _position);
+      return (bufdata.size + bufdata.pos);
+   } 
+
+   template <>
+      std::size_t CBuffer::getRequestedSize(std::string data)
+   { 
+      return (DATA_HEADER_SIZE + data.size() * sizeof (char)); 
+   }
+   
+   // --------------------------------------------------------------------------
+   
+#define BufferDataTypeGetter(type, type_enum)\
+   template <> CBuffer::CBufferDataType \
+      CBuffer::getBufferDataType<type>(void) { return (type_enum); }; \
+   template <> CBuffer::CBufferDataType \
+      CBuffer::getBufferDataType<boost::multi_array<type, 1> >(void) { return (type_enum); };
+
+      BufferDataTypeGetter(bool,     TBOOL8);
+      BufferDataTypeGetter(char,     TCHAR8);
+      BufferDataTypeGetter(float,    TFLOAT32);
+      BufferDataTypeGetter(double,   TDOUBLE64);
+      BufferDataTypeGetter(long int, TINT32);
+
+#undef BufferDataTypeGetter
+      
+   // ------------------------- Ecriture binaire -------------------------------
+
+   void CBuffer::printToBinaryFile (const std::string & _filename)
+   {
+      std::ofstream ofs(_filename.c_str());
+      this->printToBinaryStream(ofs);
+      ofs.close();
+   }
+     
+   void CBuffer::printToBinaryStream (std::ostream & _ostr)
+   {  
+      _ostr.write (this->getData(), this->getSize()); 
+   }
+   
+   // --------------------------------------------------------------------------
+   
+#define CBufferGetter(type, Type)       \
+   type CBuffer::get##Type(std::size_t _position) const \
+   { type retvalue; this->getData<type>(retvalue, _position); return (retvalue); }
+
+
+      CBufferGetter(char     , Char)
+      CBufferGetter(bool     , Bool)
+      CBufferGetter(float    , Float)
+      CBufferGetter(double   , Double)
+      CBufferGetter(long int , Int)
+
+#undef CBufferGetter
+
+   // --------------------------------------------------------------------------
+
+#define CBufferArrayGetter(type, Type)                                   \
+   boost::shared_ptr<boost::multi_array<type, 1> >                       \
+                  CBuffer::get##Type##Array(std::size_t _position) const \
+   {  boost::shared_ptr<boost::multi_array<type, 1> > retvalue           \
+                 (new boost::multi_array<type, 1>(boost::extents[1]));        \
+      this->getDataArray<type>(*retvalue, _position);                    \
+      return (retvalue); }
+
+      CBufferArrayGetter(char     , Char)
+      CBufferArrayGetter(bool     , Bool)
+      CBufferArrayGetter(float    , Float)
+      CBufferArrayGetter(double   , Double)
+      CBufferArrayGetter(long int , Int)
+
+#undef CBufferArrayGetter
+
+      std::string CBuffer::getString(std::size_t position) const
+      {
+         boost::shared_ptr<boost::multi_array<char, 1> > array = this->getCharArray(position);
+         return (std::string(array->data(), array->num_elements()));
+      }
+
+   // --------------------------------------------------------------------------
+
+#define CBufferSetter(type, Type) \
+      void  CBuffer::set##Type(type _value, std::size_t _position) \
+      { this->setData(_value, _position); }
+
+      CBufferSetter(char     , Char)
+      CBufferSetter(bool     , Bool)
+      CBufferSetter(float    , Float)
+      CBufferSetter(double   , Double)
+      CBufferSetter(long int , Int)
+
+#undef CBufferSetter
+
+   // --------------------------------------------------------------------------
+
+#define CBufferArraySetter(type, Type)                                                 \
+      void  CBuffer::set##Type##Array                                                  \
+      (boost::shared_ptr<boost::multi_array<type, 1> >  _value, std::size_t _position) \
+      { this->setDataArray(*_value, _position); }
+
+      CBufferArraySetter(char     , Char)
+      CBufferArraySetter(bool     , Bool)
+      CBufferArraySetter(float    , Float)
+      CBufferArraySetter(double   , Double)
+      CBufferArraySetter(long int , Int)
+
+#undef CBufferArraySetter
+
+      void CBuffer::setString(const std::string & value, std::size_t position)
+      {
+         boost::shared_ptr<boost::multi_array<char, 1> > arr          
+                 (new boost::multi_array<char, 1>(boost::extents[value.size()]));
+         std::copy(value.data(), &(value.data()[value.size()]), arr->data());
+         this->setCharArray(arr, position);
+      }
+      
+   // --------------------------------------------------------------------------
+
 } // namespace comm
 } // namespace xmlioserver

XMLIO_V2/dev/dev_rv/src4/xmlio/buffer/buffer.hpp

@@ -62 +62 @@
             
             template <class T> static CBufferDataType getBufferDataType(void);
+
+            std::size_t getNextDataPosition(std::size_t _position);
             
          public : // Accesseurs
@@ -68 +70 @@
             char * getData(std::size_t _position = 0) const;
             
-         public : // Accesseurs  de données
+         public : // Accesseurs de données
 
             template <class T>
@@ -74 +76 @@
             
             template <class T>
-               inline void getDataArray(boost::multi_array<T, 1> & _data, std::size_t _position) const;
+               inline void getDataArray
+                  (boost::multi_array<T, 1> & _data, std::size_t _position) const;
+            
+         //--------------------------------------------------------------
+
+            char     getChar  (std::size_t position) const;
+            bool     getBool  (std::size_t position) const;
+            float    getFloat (std::size_t position) const;
+            double   getDouble(std::size_t position) const;
+            long int getInt   (std::size_t position) const;
+
+            std::string getString(std::size_t position) const;
+
+            boost::shared_ptr<boost::multi_array<char,     1> > 
+               getCharArray  (std::size_t _position) const;
+            boost::shared_ptr<boost::multi_array<bool,     1> > 
+               getBoolArray  (std::size_t _position) const;
+            boost::shared_ptr<boost::multi_array<float,    1> >
+               getFloatArray (std::size_t _position) const;
+            boost::shared_ptr<boost::multi_array<double,   1> >
+               getDoubleArray(std::size_t _position) const;
+            boost::shared_ptr<boost::multi_array<long int, 1> > 
+               getIntArray   (std::size_t _position) const;
+
+         //--------------------------------------------------------------         
 
          public : // Mutateurs de données
@@ -82 +108 @@
             
             template <class T>
-               inline CBufferData setDataArray(const boost::multi_array<T, 1> & _data, std::size_t _position);
+               inline CBufferData setDataArray
+                  (const boost::multi_array<T, 1> & _data, std::size_t _position);
+            
+         //--------------------------------------------------------------
+
+            /// Mutateurs ///
+            void setChar  (char     value, std::size_t position) ;
+            void setBool  (bool     value, std::size_t position) ;
+            void setFloat (float    value, std::size_t position) ;
+            void setDouble(double   value, std::size_t position) ;
+            void setInt   (long int value, std::size_t position) ;
+
+            void setString(const std::string & value, std::size_t position) ;
+
+            void setCharArray  
+               (boost::shared_ptr<boost::multi_array<char,     1> > _value, std::size_t _position) ;
+            void setBoolArray  
+               (boost::shared_ptr<boost::multi_array<bool,     1> > _value, std::size_t _position) ;
+            void setFloatArray 
+               (boost::shared_ptr<boost::multi_array<float,    1> > _value, std::size_t _position) ;
+            void setDoubleArray
+               (boost::shared_ptr<boost::multi_array<double,   1> > _value, std::size_t _position) ;
+            void setIntArray   
+               (boost::shared_ptr<boost::multi_array<long int, 1> > _value, std::size_t _position) ;
+
+         //-------------------------------------------------------------- 
+            
+            virtual void clear(void) = 0;
+            void updateBufferData(std::size_t _position);
             
          public : // Sortie fichier binaire
@@ -112 +166 @@
          private: // Propriétés privées
             
-            bool delIdata;
             std::size_t size;
-            const char * idata;
+            bool delIdata; 
+            char * idata;
             
       }; // class CBuffer