X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fnet%2Fprotocol.h;h=6d15a330295a0592b3e921d7737cde6cf515507d;hb=6625cf0e574406425c35d33110f8d99617e902df;hp=05ea60e2f13232305a0ca18c9b50850db25e013c;hpb=8248f2912454229f4ded72b8fb4db3e76ea3ad15;p=libs%2Fnet.git

diff --git a/source/net/protocol.h b/source/net/protocol.h
index 05ea60e..6d15a33 100644
--- a/source/net/protocol.h
+++ b/source/net/protocol.h
@@ -1,10 +1,11 @@
 #ifndef MSP_NET_PROTOCOL_H_
 #define MSP_NET_PROTOCOL_H_
 
+#include <cstdint>
 #include <map>
 #include <stdexcept>
 #include <vector>
-#include <msp/core/inttypes.h>
+#include <msp/core/hash.h>
 #include "receiver.h"
 
 namespace Msp {
@@ -14,7 +15,6 @@ class bad_packet: public std::runtime_error
 {
 public:
 	bad_packet(const std::string &w): std::runtime_error(w) { }
-	virtual ~bad_packet() throw() { }
 };
 
 
@@ -22,14 +22,13 @@ class buffer_error: public std::runtime_error
 {
 public:
 	buffer_error(const std::string &w): std::runtime_error(w) { }
-	virtual ~buffer_error() throw() { }
 };
 
 
 class Protocol
 {
 private:
-	template<typename T, UInt8 K>
+	template<typename T, std::uint8_t K>
 	struct BasicTraits;
 
 	template<typename T>
@@ -38,9 +37,9 @@ private:
 	template<typename C>
 	struct CompoundTypeDef
 	{
-		virtual ~CompoundTypeDef() { }
+		virtual ~CompoundTypeDef() = default;
 
-		virtual std::string describe() const = 0;
+		virtual std::uint64_t get_hash() const = 0;
 		virtual char *serialize(const C &, char *, char *) const = 0;
 		virtual const char *deserialize(C &, const char *, const char *) const = 0;
 	};
@@ -52,9 +51,9 @@ private:
 
 		CompoundDef(const S &);
 
-		virtual std::string describe() const;
-		virtual char *serialize(const C &, char *, char *) const;
-		virtual const char *deserialize(C &, const char *, const char *) const;
+		std::uint64_t get_hash() const override;
+		char *serialize(const C &, char *, char *) const override;
+		const char *deserialize(C &, const char *, const char *) const override;
 	};
 
 	template<typename T>
@@ -65,7 +64,7 @@ private:
 
 		BasicSerializer(const Protocol &) { }
 
-		std::string describe() const { return get_type_signature<T>(); }
+		std::uint64_t get_hash() const { return Traits<T>::signature; }
 		char *serialize(const T &, char *, char *) const;
 		const char *deserialize(T &, const char *, const char *) const;
 	};
@@ -76,12 +75,12 @@ private:
 		typedef std::string ValueType;
 
 	private:
-		BasicSerializer<UInt16> length_serializer;
+		BasicSerializer<std::uint16_t> length_serializer;
 
 	public:
 		StringSerializer(const Protocol &);
 
-		std::string describe() const { return get_type_signature<std::string>(); }
+		std::uint64_t get_hash() const;
 		char *serialize(const std::string &, char *, char *) const;
 		const char *deserialize(std::string &, const char *, const char *) const;
 	};
@@ -93,13 +92,13 @@ private:
 		typedef A ValueType;
 
 	private:
-		BasicSerializer<UInt16> length_serializer;
+		BasicSerializer<std::uint16_t> length_serializer;
 		typename Traits<typename A::value_type>::Serializer element_serializer;
 
 	public:
 		ArraySerializer(const Protocol &);
 
-		std::string describe() const;
+		std::uint64_t get_hash() const;
 		char *serialize(const A &, char *, char *) const;
 		const char *deserialize(A &, const char *, const char *) const;
 	};
@@ -116,7 +115,6 @@ private:
 	public:
 		CompoundSerializer(const Protocol &);
 
-		std::string describe() const { return def.describe(); }
 		char *serialize(const C &, char *, char *) const;
 		const char *deserialize(C &, const char *, const char *) const;
 	};
@@ -140,7 +138,7 @@ private:
 	public:
 		Serializer(const Head &, Pointer, const Protocol &);
 
-		std::string describe() const;
+		std::uint64_t get_hash() const;
 		char *serialize(const P &, char *, char *) const;
 		const char *deserialize(P &, const char *, const char *) const;
 	};
@@ -155,7 +153,7 @@ private:
 			typedef Serializer<P, NullSerializer, typename Traits<N>::Serializer> Type;
 		};
 
-		std::string describe() const { return std::string(); }
+		std::uint64_t get_hash() const { return 0; }
 		char *serialize(const P &, char *b, char *) const { return b; }
 		const char *deserialize(P &, const char *b, const char *) const { return b; }
 	};
@@ -165,14 +163,13 @@ private:
 	protected:
 		unsigned id;
 
-		static unsigned next_class_id;
-
 		PacketDefBase(unsigned);
 	public:
-		virtual ~PacketDefBase() { }
+		virtual ~PacketDefBase() = default;
+
 		virtual unsigned get_class_id() const = 0;
 		unsigned get_id() const { return id; }
-		virtual std::string describe() const = 0;
+		virtual std::uint64_t get_hash() const = 0;
 		virtual const char *dispatch(ReceiverBase &, const char *, const char *) const = 0;
 	};
 
@@ -182,24 +179,21 @@ private:
 	private:
 		CompoundTypeDef<P> *compound;
 
-		static unsigned class_id;
-
 	public:
 		PacketTypeDef(unsigned);
 		~PacketTypeDef();
 
-		static unsigned get_static_class_id() { return class_id; }
-		virtual unsigned get_class_id() const { return class_id; }
+		unsigned get_class_id() const override { return get_packet_class_id<P>(); }
 
 		template<typename S>
 		void set_serializer(const S &);
 
 		const CompoundTypeDef<P> &get_compound() const { return *compound; }
 
-		virtual std::string describe() const { return compound->describe(); }
+		std::uint64_t get_hash() const override { return compound->get_hash(); }
 		char *serialize(const P &, char *, char *) const;
 		const char *deserialize(P &, const char *, const char *) const;
-		virtual const char *dispatch(ReceiverBase &, const char *, const char *) const;
+		const char *dispatch(ReceiverBase &, const char *, const char *) const override;
 	};
 
 	template<typename P, typename S>
@@ -219,11 +213,11 @@ private:
 
 	struct PacketHeader
 	{
-		UInt16 type;
-		UInt16 length;
+		std::uint16_t type = 0;
+		std::uint16_t length = 0;
 
-		PacketHeader();
-		PacketHeader(UInt16, UInt16);
+		PacketHeader() = default;
+		PacketHeader(std::uint16_t, std::uint16_t);
 	};
 
 	typedef std::map<unsigned, PacketDefBase *> PacketMap;
@@ -239,6 +233,11 @@ public:
 	~Protocol();
 
 private:
+	static unsigned get_next_packet_class_id();
+
+	template<typename P>
+	static unsigned get_packet_class_id();
+
 	void add_packet(PacketDefBase *);
 
 protected:
@@ -256,19 +255,22 @@ protected:
 
 public:
 	template<typename P>
-	unsigned serialize(const P &, char *, unsigned) const;
+	std::size_t serialize(const P &, char *, std::size_t) const;
 
-	unsigned get_packet_size(const char *, unsigned) const;
-	unsigned dispatch(ReceiverBase &, const char *, unsigned) const;
+	std::size_t get_packet_size(const char *, std::size_t) const;
+	std::size_t dispatch(ReceiverBase &, const char *, std::size_t) const;
 
-	UInt64 get_hash() const;
-
-private:
-	template<typename T>
-	static std::string get_type_signature();
+	std::uint64_t get_hash() const;
 };
 
 
+template<typename P>
+unsigned Protocol::get_packet_class_id()
+{
+	static unsigned id = get_next_packet_class_id();
+	return id;
+}
+
 template<typename P>
 Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add(unsigned id)
 {
@@ -286,67 +288,59 @@ Protocol::PacketDefBuilder<P, Protocol::NullSerializer<P> > Protocol::add()
 template<typename P>
 const Protocol::PacketTypeDef<P> &Protocol::get_packet_by_class() const
 {
-	const PacketDefBase &pdef = get_packet_by_class_id(PacketTypeDef<P>::get_static_class_id());
+	const PacketDefBase &pdef = get_packet_by_class_id(get_packet_class_id<P>());
 	return static_cast<const PacketTypeDef<P> &>(pdef);
 }
 
 template<typename P>
-unsigned Protocol::serialize(const P &pkt, char *buf, unsigned size) const
+std::size_t Protocol::serialize(const P &pkt, char *buf, std::size_t size) const
 {
 	const PacketTypeDef<P> &pdef = get_packet_by_class<P>();
+	if(!pdef.get_id())
+		throw std::invalid_argument("no packet id");
 	char *ptr = pdef.serialize(pkt, buf+4, buf+size);
 	size = ptr-buf;
 	header_def.serialize(PacketHeader(pdef.get_id(), size), buf, buf+4);
 	return size;
 }
 
-template<typename T>
-std::string Protocol::get_type_signature()
-{
-	const UInt16 sig = Traits<T>::signature;
-	std::string result;
-	result += sig&0xFF;
-	if(sig>=0x100)
-		result += '0'+(sig>>8);
-	return result;
-}
-
 
-template<typename T, UInt8 K>
+template<typename T, std::uint8_t K>
 struct Protocol::BasicTraits
 {
-	static const UInt16 signature = K | (sizeof(T)<<8);
+	static const std::uint16_t signature = K | (sizeof(T)<<8);
 	typedef BasicSerializer<T> Serializer;
 };
 
 template<typename T>
 struct Protocol::Traits
 {
-	static const UInt16 signature = 'C';
+	static const std::uint16_t signature = 'C';
 	typedef CompoundSerializer<T> Serializer;
 };
 
-template<> struct Protocol::Traits<Int8>: BasicTraits<Int8, 'I'> { };
-template<> struct Protocol::Traits<UInt8>: BasicTraits<UInt8, 'U'> { };
-template<> struct Protocol::Traits<Int16>: BasicTraits<Int16, 'I'> { };
-template<> struct Protocol::Traits<UInt16>: BasicTraits<UInt16, 'U'> { };
-template<> struct Protocol::Traits<Int32>: BasicTraits<Int32, 'I'> { };
-template<> struct Protocol::Traits<UInt32>: BasicTraits<UInt32, 'U'> { };
-template<> struct Protocol::Traits<Int64>: BasicTraits<Int64, 'I'> { };
-template<> struct Protocol::Traits<UInt64>: BasicTraits<UInt64, 'U'> { };
+template<> struct Protocol::Traits<bool>: BasicTraits<bool, 'B'> { };
+template<> struct Protocol::Traits<std::int8_t>: BasicTraits<std::int8_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint8_t>: BasicTraits<std::uint8_t, 'U'> { };
+template<> struct Protocol::Traits<std::int16_t>: BasicTraits<std::int16_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint16_t>: BasicTraits<std::uint16_t, 'U'> { };
+template<> struct Protocol::Traits<std::int32_t>: BasicTraits<std::int32_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint32_t>: BasicTraits<std::uint32_t, 'U'> { };
+template<> struct Protocol::Traits<std::int64_t>: BasicTraits<std::int64_t, 'I'> { };
+template<> struct Protocol::Traits<std::uint64_t>: BasicTraits<std::uint64_t, 'U'> { };
 template<> struct Protocol::Traits<float>: BasicTraits<float, 'F'> { };
 template<> struct Protocol::Traits<double>: BasicTraits<double, 'F'> { };
 
 template<> struct Protocol::Traits<std::string>
 {
-	static const UInt16 signature = 'S';
+	static const std::uint16_t signature = 'S';
 	typedef StringSerializer Serializer;
 };
 
 template<typename T>
 struct Protocol::Traits<std::vector<T> >
 {
-	static const UInt16 signature = 'A';
+	static const std::uint16_t signature = 'A';
 	typedef ArraySerializer<std::vector<T> > Serializer;
 };
 
@@ -358,9 +352,9 @@ Protocol::CompoundDef<C, S>::CompoundDef(const S &s):
 { }
 
 template<typename C, typename S>
-std::string Protocol::CompoundDef<C, S>::describe() const
+std::uint64_t Protocol::CompoundDef<C, S>::get_hash() const
 {
-	return "{"+serializer.describe()+"}";
+	return hash_round<64>(serializer.get_hash(), 'C');
 }
 
 template<typename C, typename S>
@@ -376,6 +370,12 @@ const char *Protocol::CompoundDef<C, S>::deserialize(C &com, const char *buf, co
 }
 
 
+inline std::uint64_t Protocol::StringSerializer::get_hash() const
+{
+	return Traits<std::string>::signature;
+}
+
+
 template<typename A>
 Protocol::ArraySerializer<A>::ArraySerializer(const Protocol &proto):
 	length_serializer(proto),
@@ -383,24 +383,24 @@ Protocol::ArraySerializer<A>::ArraySerializer(const Protocol &proto):
 { }
 
 template<typename A>
-std::string Protocol::ArraySerializer<A>::describe() const
+std::uint64_t Protocol::ArraySerializer<A>::get_hash() const
 {
-	return "["+element_serializer.describe()+"]";
+	return hash_round<64>(element_serializer.get_hash(), 'A');
 }
 
 template<typename A>
 char *Protocol::ArraySerializer<A>::serialize(const A &array, char *buf, char *end) const
 {
 	buf = length_serializer.serialize(array.size(), buf, end);
-	for(typename A::const_iterator i=array.begin(); i!=array.end(); ++i)
-		buf = element_serializer.serialize(*i, buf, end);
+	for(const auto &e: array)
+		buf = element_serializer.serialize(e, buf, end);
 	return buf;
 }
 
 template<typename A>
 const char *Protocol::ArraySerializer<A>::deserialize(A &array, const char *buf, const char *end) const
 {
-	UInt16 length;
+	std::uint16_t length;
 	buf = length_serializer.deserialize(length, buf, end);
 	array.resize(length);
 	for(unsigned i=0; i<length; ++i)
@@ -435,9 +435,9 @@ Protocol::Serializer<P, Head, S>::Serializer(const Head &h, Pointer p, const Pro
 { }
 
 template<typename P, typename Head, typename S>
-std::string Protocol::Serializer<P, Head, S>::describe() const
+std::uint64_t Protocol::Serializer<P, Head, S>::get_hash() const
 {
-	return Head::describe()+ser.describe();
+	return hash_update<64>(Head::get_hash(), ser.get_hash());
 }
 
 template<typename P, typename Head, typename S>
@@ -459,10 +459,7 @@ template<typename P>
 Protocol::PacketTypeDef<P>::PacketTypeDef(unsigned i):
 	PacketDefBase(i),
 	compound(new CompoundDef<P, NullSerializer<P> >(NullSerializer<P>()))
-{
-	if(!class_id)
-		class_id = next_class_id++;
-}
+{ }
 
 template<typename P>
 Protocol::PacketTypeDef<P>::~PacketTypeDef()