qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r629679 - in /incubator/qpid/trunk/qpid/cpp/src: ./ qpid/ qpid/amqp_0_10/ qpid/framing/ qpid/sys/ tests/
Date Thu, 21 Feb 2008 02:58:38 GMT
Author: aconway
Date: Wed Feb 20 18:58:37 2008
New Revision: 629679

URL: http://svn.apache.org/viewvc?rev=629679&view=rev
Log:

AMQP 0-10 type system:
 - new lightweight templated serialization framework
 - all fixed-size built-in types tested and working
 - all vbin & str types implemented, tests disabled need to fix encoding.

The following types remain to be implemented:

byte-ranges       2 byte ranges within a 64-bit payload
sequence-set      2 ranged set representation
map          0xa8 4 a mapping of keys to typed values
list         0xa9 4 a series of consecutive type-value pairs
array        0xaa 4 a defined length collection of values of a single type
struct32     0xab 4 a coded struct with a 32-bit size

Added:
    incubator/qpid/trunk/qpid/cpp/src/qpid/Serializer.h   (with props)
    incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/
    incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codec.h   (with props)
    incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Decimal.h   (with props)
    incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h   (with props)
    incubator/qpid/trunk/qpid/cpp/src/tests/serialize.cpp   (with props)
Modified:
    incubator/qpid/trunk/qpid/cpp/src/Makefile.am
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h
    incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h
    incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am

Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=629679&r1=629678&r2=629679&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Wed Feb 20 18:58:37 2008
@@ -101,6 +101,10 @@
 libqpidcommon_la_SOURCES = \
   $(rgen_common_cpp) \
   $(platform_src) \
+  qpid/Serializer.h \
+  qpid/amqp_0_10/built_in_types.h \
+  qpid/amqp_0_10/Codec.h \
+  qpid/amqp_0_10/Decimal.h \
   qpid/framing/AccumulatedAck.cpp \
   qpid/framing/AMQBody.cpp \
   qpid/framing/AMQMethodBody.cpp \

Added: incubator/qpid/trunk/qpid/cpp/src/qpid/Serializer.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/Serializer.h?rev=629679&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/Serializer.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/Serializer.h Wed Feb 20 18:58:37 2008
@@ -0,0 +1,109 @@
+#ifndef QPID_SERIALIZERBASE_H
+#define QPID_SERIALIZERBASE_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include <boost/cast.hpp>
+#include <boost/array.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/type_traits/is_class.hpp>
+
+namespace qpid {
+
+/**
+ * Base template for serializers, provides generic serialization for
+ * conmpound types and common encode/decode/size functions.
+ *
+ * Derived template must provide
+ * - Derived& op()(T) for primitive types.
+ * - Derived& raw(void*, size_t) for raw binary data
+ * - Derived& byte(char) for single bytes.
+ * 
+ * Derived templatse may override any of the functions provided by
+ * this base class.
+ *
+ * This class provides templates to break down compound types 
+ * into primitive types and delegate to the derived class.
+ *
+ */
+template <class Derived> class Serializer {
+  public:
+
+    /** Call T::serialize() for classes that have their own serialize function */
+    template <class T>
+    typename boost::enable_if<boost::is_class<T>, Derived>::type
+    operator()(T& t) { t.serialize(self()); return self(); }
+
+    template <class T, size_t N>
+    Derived& operator()(boost::array<T,N>& a) {
+        std::for_each(a.begin(), a.end(), self());
+        return self();
+    }
+
+    Derived& operator()(char& x) { return self().byte((char&)x); }
+    Derived& operator()(int8_t& x) { return self().byte((char&)x); }
+    Derived& operator()(uint8_t& x) { return self().byte((char&)x); }
+
+  protected:
+    template <class T> Derived& raw(T& t) {
+        return self().raw(&t, sizeof(T));
+    }
+
+  private:
+    Derived& self() { return *static_cast<Derived*>(this); }
+};
+
+/** Like Serializer but does not modify the values passed to it. */
+template <class Derived> class ConstSerializer {
+  public:
+    template <class T>
+    typename boost::enable_if<boost::is_class<T>, Derived>::type
+    operator()(const T& t) {
+        // Const cast so we don't have to write 2 serialize() functions
+        // for every class.
+        const_cast<T&>(t).serialize(self());
+        return self();
+    }
+
+    template <class T, size_t N>
+    Derived& operator()(const boost::array<T,N>& a) {
+        std::for_each(a.begin(), a.end(), self());
+        return self();
+    }
+
+    Derived& operator()(char x) { return self().byte(x); }
+    Derived& operator()(int8_t x) { return self().byte(x); }
+    Derived& operator()(uint8_t x) { return self().byte(x); }
+
+  protected:
+    template <class T> Derived& raw(const T& t) {
+        return self().raw(&t, sizeof(T));
+    }
+
+  private:
+    Derived& self() { return *static_cast<Derived*>(this); }
+};
+
+
+} // namespace qpid
+
+#endif  /*!QPID_SERIALIZERBASE_H*/

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/Serializer.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/Serializer.h
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codec.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codec.h?rev=629679&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codec.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codec.h Wed Feb 20 18:58:37 2008
@@ -0,0 +1,187 @@
+#ifndef QPID_AMQP_0_10_CODEC_H
+#define QPID_AMQP_0_10_CODEC_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "built_in_types.h"
+#include "qpid/Serializer.h"
+#include <boost/type_traits/is_integral.hpp>
+#include <boost/type_traits/is_float.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+#include <boost/detail/endian.hpp>
+#include <boost/ref.hpp>
+
+namespace qpid {
+namespace amqp_0_10 {
+
+/**
+ * AMQP 0-10 encoding and decoding.
+ */
+struct Codec
+{
+    template <class T>
+    static inline void endianize(T& value) {
+
+#ifdef BOOST_LITTLE_ENDIAN
+        std::reverse((char*)&value, (char*)&value+sizeof(value));
+#else
+        (void)value;            // Avoid unused var warnings.
+#endif
+    }
+    static inline void endianize(char&) {}
+    static inline void endianize(uint8_t&) {}
+    static inline void endianize(int8_t&) {}
+
+
+    template <class Out> struct Encode : public ConstSerializer<Encode<Out>
> {
+        Out out;
+
+        Encode(Out o) : out(o) {}
+
+        using ConstSerializer<Encode<Out> >::operator();
+        using ConstSerializer<Encode<Out> >::raw;
+
+        template <class T> 
+        typename boost::enable_if<boost::is_integral<T>, Encode&>::type
+        operator()(const T& x) { T xx(x); endianize(xx); return raw(xx); }
+
+        // FIXME aconway 2008-02-20: correct float encoading
+        template <class T>
+        typename boost::enable_if<boost::is_float<T>, Encode&>::type
+        operator()(const T& x) { return raw(x); }
+
+
+        template<class T, class SizeType>
+        Encode& operator()(const CodableString<T,SizeType>& str) {
+            (*this)(SizeType(str.size()));
+            std::for_each(str.begin(), str.end(), *this);
+            return *this;
+        }
+
+      private:
+      friend class ConstSerializer<Encode<Out> >;
+
+        Encode& raw(const void* vp, size_t s) {
+            char* p = (char*) vp;
+            std::copy(p, p+s, out);
+            return *this;
+        }
+
+        Encode& byte(char x) { out++ = x; return *this; }
+    };
+
+    template <class In> struct Decode : public Serializer<Decode<In> >
{
+        In in;
+        Decode(In i) : in(i) {}
+
+        using Serializer<Decode<In> >::operator();
+        using Serializer<Decode<In> >::raw;
+
+        template <class T>
+        typename boost::enable_if<boost::is_integral<T>, Decode&>::type
+        operator()(T& x) {
+            raw(&x, sizeof(x));
+            endianize(x);
+            return *this;
+        }
+
+        template <class T>
+        typename boost::enable_if<boost::is_float<T>, Decode&>::type
+        operator()(T& x) { return raw(&x, sizeof(x)); }
+
+        template<class T, class SizeType>
+        Decode& operator()(CodableString<T,SizeType>& str) {
+            SizeType n;
+            (*this)(n);
+            str.resize(n);
+            std::for_each(str.begin(), str.end(), *this);
+            return *this;
+        }
+
+      private:
+      friend class Serializer<Decode<In> >;
+        
+        Decode& raw(void* vp, size_t s) {
+            char* p=(char*)vp;
+            std::copy(in, in+s, p);
+            return *this;
+        }
+
+        Decode& byte(char& x) { x = *in++; return *this; }        
+    };
+
+    struct Size : public ConstSerializer<Size> {
+        Size() : size(0) {}
+        size_t size;
+        operator size_t() const { return size; }
+
+        using ConstSerializer<Size>::operator();
+        using ConstSerializer<Size>::raw;
+        
+        template <class T>
+        typename boost::enable_if<boost::is_arithmetic<T>, Size&>::type
+        operator()(const T&) { size += sizeof(T); return *this; }
+
+        template <class T, size_t N>
+        Size& operator()(const boost::array<T,N>&) {
+            size += sizeof(boost::array<T,N>);
+            return *this;
+        }
+
+        template<class T, class SizeType>
+        Size& operator()(const CodableString<T,SizeType>& str) {
+            size += sizeof(SizeType) + str.size()*sizeof(T);
+            return *this;
+        }
+
+
+      private:
+      friend class ConstSerializer<Size>;
+
+        Size& raw(void*, size_t s) { size += s; return *this; }
+        
+        Size& byte(char) { ++size; return *this; }        
+    };
+
+    template <class Out, class T>
+    static void encode(Out o, const T& x) {
+        Encode<Out>encode(o);
+        encode(x);
+    }
+
+    template <class In, class T>
+    static void decode(In i, T& x) {
+        Decode<In> decode(i);
+        decode(x);
+    }
+
+    template <class T>
+    static size_t size(const T& x) {
+        Size sz;
+        sz(x);
+        return sz;
+    }
+};
+
+}} // namespace qpid::amqp_0_10
+
+#endif  /*!QPID_AMQP_0_10_CODEC_H*/

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codec.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Codec.h
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Decimal.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Decimal.h?rev=629679&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Decimal.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Decimal.h Wed Feb 20 18:58:37 2008
@@ -0,0 +1,52 @@
+#ifndef TESTS_DECIMAL_H
+#define TESTS_DECIMAL_H
+
+/*
+  *
+  * Licensed to the Apache Software Foundation (ASF) under one
+  * or more contributor license agreements.  See the NOTICE file
+  * distributed with this work for additional information
+  * regarding copyright ownership.  The ASF licenses this file
+  * to you under the Apache License, Version 2.0 (the
+  * "License"); you may not use this file except in compliance
+  * with the License.  You may obtain a copy of the License at
+  * 
+  *   http://www.apache.org/licenses/LICENSE-2.0
+  * 
+  * Unless required by applicable law or agreed to in writing,
+  * software distributed under the License is distributed on an
+  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  * KIND, either express or implied.  See the License for the
+  * specific language governing permissions and limitations
+  * under the License.
+  *
+  */
+#include <ostream>
+
+namespace qpid {
+namespace amqp_0_10 {
+
+template <class E, class M> struct Decimal {
+    E exponent;
+    M mantissa;
+    
+    Decimal() : exponent(0), mantissa(0) {}
+
+    bool operator==(const Decimal& d) const {
+        return exponent == d.exponent && mantissa == d.mantissa;
+    }
+
+    // TODO aconway 2008-02-20: We could provide arithmetic operators
+    // if anybody really cares about this type.
+
+    template <class S> void serialize(S& s) { s(exponent)(mantissa); }
+};
+
+template<class E, class M>
+inline std::ostream& operator<<(std::ostream& o, const Decimal<E,M>&
d) {
+    M pow10=10^d.exponent;
+    return o << d.mantissa/pow10 << "." << d.mantissa%pow10;
+}
+}}
+
+#endif  /*!TESTS_DECIMAL_H*/

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Decimal.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Decimal.h
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h?rev=629679&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h Wed Feb 20 18:58:37
2008
@@ -0,0 +1,103 @@
+#ifndef QPID_AMQP_0_10_BUILT_IN_TYPES_H
+#define QPID_AMQP_0_10_BUILT_IN_TYPES_H
+// FIXME aconway 2008-02-20: separate _fwd.h from full include.
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "Decimal.h"
+#include "qpid/framing/SequenceNumber.h"
+#include "qpid/framing/Uuid.h"
+#include "qpid/sys/Time.h"
+#include <boost/array.hpp>
+#include <stdint.h>
+#include <string>
+
+/**@file Mapping from built-in AMQP types to C++ types */
+
+namespace qpid {
+namespace amqp_0_10 {
+
+// Fixed size types
+typedef void Void;
+
+typedef bool Bit;
+typedef bool Boolean;
+typedef char Char;
+typedef int16_t Int16;
+typedef int32_t Int32;
+typedef int64_t Int64;
+typedef int8_t Int8;
+typedef uint16_t Uint16;
+typedef uint32_t CharUtf32 ;
+typedef uint32_t Uint32;
+typedef uint64_t Uint64;
+typedef uint8_t Bin8;
+typedef uint8_t Uint8;
+
+typedef boost::array<uint8_t,128> Bin1024; 
+typedef boost::array<uint8_t,16> Bin128;
+typedef boost::array<uint8_t,2> Bin16;
+typedef boost::array<uint8_t,32> Bin256;
+typedef boost::array<uint8_t,4> Bin32;
+typedef boost::array<uint8_t,5> Bin40; 
+typedef boost::array<uint8_t,64> Bin512;
+typedef boost::array<uint8_t,8> Bin64;
+typedef boost::array<uint8_t,9> Bin72;
+
+typedef double Double;
+typedef float Float;
+typedef framing::SequenceNumber SequenceNo;
+using framing::Uuid;
+typedef sys::AbsTime DateTime;
+
+typedef Decimal<Uint8, Int32> Dec32;
+typedef Decimal<Uint8, Int64> Dec64;
+
+
+/** Template for length-prefixed strings/arrays. */
+template <class T, class SizeType>
+struct CodableString : public std::basic_string<T> {};
+
+// Variable width types
+typedef CodableString<Uint8, Uint8> Vbin8;
+typedef CodableString<char, Uint8> Str8Latin;
+typedef CodableString<char, Uint8> Str8;
+typedef CodableString<Uint16, Uint8> Str8Utf16;
+
+typedef CodableString<Uint8, Uint16> Vbin16;
+typedef CodableString<char, Uint16> Str16Latin;
+typedef CodableString<char, Uint16> Str16;
+typedef CodableString<Uint16, Uint16> Str16Utf16;
+
+typedef CodableString<Uint8, Uint32> Vbin32;
+
+/** FIXME aconway 2008-02-20: todo
+byte-ranges       2 byte ranges within a 64-bit payload
+sequence-set      2 ranged set representation
+map          0xa8 4 a mapping of keys to typed values
+list         0xa9 4 a series of consecutive type-value pairs
+array        0xaa 4 a defined length collection of values of a single type
+struct32     0xab 4 a coded struct with a 32-bit size
+*/
+
+}} // namespace qpid::amqp_0_10
+
+#endif  /*!QPID_AMQP_0_10_BUILT_IN_TYPES_H*/

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/built_in_types.h
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h?rev=629679&r1=629678&r2=629679&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/SequenceNumber.h Wed Feb 20 18:58:37 2008
@@ -50,6 +50,8 @@
     operator uint32_t() const { return (uint32_t) value; }
 
     friend int32_t operator-(const SequenceNumber& a, const SequenceNumber& b);
+
+    template <class S> void serialize(S& s) { s(value); }
 };    
 
 struct Window 

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h?rev=629679&r1=629678&r2=629679&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/Uuid.h Wed Feb 20 18:58:37 2008
@@ -65,6 +65,10 @@
 
     /** String value in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb */
     std::string str() const;
+
+    template <class S> void serialize(S& s) {
+        s(static_cast<boost::array<uint8_t, 16>&>(*this));
+    }
 };
 
 /** Print in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb */

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h?rev=629679&r1=629678&r2=629679&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/sys/Time.h Wed Feb 20 18:58:37 2008
@@ -46,6 +46,9 @@
 	 
     static AbsTime now();
     inline static AbsTime FarFuture();
+    int64_t timeValue() const { return time_ns; }
+    bool operator==(const AbsTime& t) const { return t.time_ns == time_ns; }
+    template <class S> void serialize(S& s) { s(time_ns); }
 
   friend bool operator<(const AbsTime& a, const AbsTime& b);
   friend bool operator>(const AbsTime& a, const AbsTime& b);

Modified: incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am?rev=629679&r1=629678&r2=629679&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/Makefile.am Wed Feb 20 18:58:37 2008
@@ -37,7 +37,8 @@
 	Shlib.cpp FieldValue.cpp FieldTable.cpp Array.cpp \
 	InlineVector.cpp \
 	ISList.cpp IList.cpp \
-	ClientSessionTest.cpp
+	ClientSessionTest.cpp \
+	serialize.cpp
 # FIXME aconway 2008-02-20: removed RefCountedMap.cpp  due to valgrind error.
 
 check_LTLIBRARIES += libshlibtest.la

Added: incubator/qpid/trunk/qpid/cpp/src/tests/serialize.cpp
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/serialize.cpp?rev=629679&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/serialize.cpp (added)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/serialize.cpp Wed Feb 20 18:58:37 2008
@@ -0,0 +1,135 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "unit_test.h"
+#include "qpid/amqp_0_10/built_in_types.h"
+#include "qpid/amqp_0_10/Codec.h"
+#include <boost/test/test_case_template.hpp>
+#include <boost/type_traits/is_arithmetic.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/mpl/vector.hpp>
+#include <boost/mpl/back_inserter.hpp>
+#include <boost/mpl/copy.hpp>
+#include <boost/mpl/empty_sequence.hpp>
+#include <iterator>
+#include <string>
+#include <ostream>
+#include <netinet/in.h>
+
+// Missing operators needed for tests.
+namespace boost {
+template <class T, size_t N>
+std::ostream& operator<<(std::ostream& out, const array<T,N>& a)
{
+    std::ostream_iterator<T> o(out, " ");
+    std::copy(a.begin(), a.end(), o);
+    return out;
+}
+} // boost
+
+namespace qpid {
+namespace sys {
+
+std::ostream& operator<<(std::ostream& out, const AbsTime& t) {
+    return out << t.timeValue();
+}
+}
+
+namespace amqp_0_10 {
+template <class T, class SizeType>
+std::ostream& operator<<(std::ostream& out, const CodableString<T,SizeType>&
str) {
+    std::ostream_iterator<T> o(out, " ");
+    std::copy(str.begin(), str.end(), o);
+    return out;
+}
+}
+
+} // qpid
+
+
+QPID_AUTO_TEST_SUITE(SerializeTestSuite)
+
+
+
+using namespace std;
+namespace mpl=boost::mpl;
+using namespace qpid::amqp_0_10;
+
+template <class A, class B> struct concat2 { typedef typename mpl::copy<B, typename
mpl::back_inserter<A> >::type type; };
+template <class A, class B, class C> struct concat3 { typedef typename concat2<A,
typename concat2<B, C>::type>::type type; };
+template <class A, class B, class C, class D> struct concat4 { typedef typename concat2<A,
typename concat3<B, C, D>::type>::type type; };
+
+typedef mpl::vector<Bit, Boolean, Char, Int32, Int64, Int8, Uint16, CharUtf32, Uint32,
Uint64, Bin8, Uint8>::type IntegralTypes;
+typedef mpl::vector<Bin1024, Bin128, Bin16, Bin256, Bin32, Bin40, Bin512, Bin64, Bin72>::type
BinTypes;
+typedef mpl::vector<Double, Float>::type FloatTypes;
+typedef mpl::vector<SequenceNo, Uuid, DateTime, Dec32, Dec64> FixedSizeClassTypes;
+typedef mpl::vector<Vbin8, Str8Latin, Str8, Str8Utf16, Vbin16, Str16Latin, Str16, Str16Utf16,
Vbin32> VariableSizeTypes;
+
+
+typedef concat4<IntegralTypes, BinTypes, FloatTypes, FixedSizeClassTypes>::type FixedSizeTypes;
+typedef concat2<FixedSizeTypes, VariableSizeTypes>::type AllTypes;
+
+// TODO aconway 2008-02-20: should test 64 bit integrals for order also.
+BOOST_AUTO_TEST_CASE(testNetworkByteOrder) {
+    string data;
+
+    uint32_t l = 1234567890;
+    Codec::encode(std::back_inserter(data), l);
+    uint32_t enc=reinterpret_cast<const uint32_t&>(*data.data());
+    uint32_t l2 = ntohl(enc);
+    BOOST_CHECK_EQUAL(l, l2);
+
+    data.clear();
+    uint16_t s = 12345;
+    Codec::encode(std::back_inserter(data), s);
+    uint32_t s2 = ntohs(*reinterpret_cast<const uint32_t*>(data.data()));
+    BOOST_CHECK_EQUAL(s, s2);
+}
+
+void testValue(bool& b) { b = true; }
+template <class T> typename boost::enable_if<boost::is_arithmetic<T> >::type
testValue(T& n) { n=42; }
+void testValue(long long& l) { l = 12345; }
+void testValue(DateTime& dt) { dt = qpid::sys::now(); }
+void testValue(Uuid& uuid) { uuid=Uuid(true); }
+template <class E, class M> void testValue(Decimal<E,M>& d) { d.exponent=2;
d.mantissa=1234; }
+void testValue(SequenceNo& s) { s = 42; }
+template <class T, size_t N> void testValue(boost::array<T,N>& a) { a.assign(42);
}
+template <class T, class SizeType> void testValue(CodableString<T, SizeType>&
s) {
+    char msg[]="foobar";
+    s.assign(msg, msg+sizeof(msg));
+}
+
+// FIXME aconway 2008-02-20: test AllTypes
+BOOST_AUTO_TEST_CASE_TEMPLATE(testEncodeDecode, T, FixedSizeTypes)
+{
+    string data;
+    T t;
+    testValue(t);
+    Codec::encode(std::back_inserter(data), t);
+
+    BOOST_CHECK_EQUAL(Codec::size(t), data.size());
+
+    T t2;
+    Codec::decode(data.begin(), t2);
+    BOOST_CHECK_EQUAL(t,t2);
+}
+
+
+QPID_AUTO_TEST_SUITE_END()

Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/serialize.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/qpid/trunk/qpid/cpp/src/tests/serialize.cpp
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message