add BitField

include/sp/io/MessageIO.h

@@ -3,19 +3,51 @@
 #include <boost/pfr.hpp>
 #include <sp/common/ByteSwapping.h>
 #include <sp/common/DataBuffer.h>
+#include <sp/protocol/BitField.h>
 
 namespace sp {
 namespace details {
 
+template <typename T, std::size_t BitSize>
+void WriteField(DataBuffer& a_Buffer, const BitField<T, BitSize>& a_Data, std::uint64_t& a_DataRaw, std::size_t& a_Offset) {
+	T cut = *a_Data & ((1 << a_Data.GetBitSize()) - 1);
+	std::size_t pushCount = sizeof(T) * 8 - a_Offset - a_Data.GetBitSize();
+	a_DataRaw |= cut << pushCount;
+	a_Offset += a_Data.GetBitSize();
+	if (a_Offset == sizeof(T) * 8) {
+		T filled = static_cast<T>(a_DataRaw);
+		ToNetwork(filled);
+		a_Buffer << filled;
+		a_Offset = 0;
+		a_DataRaw = 0;
+	}
+}
+
 template <typename T>
-void WriteField(DataBuffer& a_Buffer, const T& a_Data) {
+void WriteField(DataBuffer& a_Buffer, const T& a_Data, std::uint64_t& a_DataRaw, std::size_t& a_Offset) {
 	T swapped = a_Data;
 	ToNetwork(swapped);
 	a_Buffer << swapped;
 }
 
+template <typename T, std::size_t BitSize>
+void ReadField(DataBuffer& a_Buffer, BitField<T, BitSize>& a_Data, std::size_t& a_Offset) {
+	a_Buffer >> *a_Data;
+	FromNetwork(*a_Data);
+	
+	*a_Data >>= sizeof(T) * 8 - a_Offset - a_Data.GetBitSize(); 
+	*a_Data &= (1 << a_Data.GetBitSize()) - 1;
+	
+	if (a_Offset != sizeof(T) * 8) {
+		a_Buffer.SetReadOffset(a_Buffer.GetReadOffset() - sizeof(T));
+		a_Offset += a_Data.GetBitSize();
+	} else {
+		a_Offset = 0;
+	}
+}
+
 template <typename T>
-void ReadField(DataBuffer& a_Buffer, T& a_Data) {
+void ReadField(DataBuffer& a_Buffer, T& a_Data, std::size_t& a_Offset) {
 	a_Buffer >> a_Data;
 	FromNetwork(a_Data);
 }
@@ -23,13 +55,17 @@ void ReadField(DataBuffer& a_Buffer, T& a_Data) {
 template <typename TData>
 DataBuffer WriteMessage(const TData& a_MessageData) {
 	DataBuffer buffer;
-	boost::pfr::for_each_field(a_MessageData, [&buffer](const auto& a_Field) { WriteField(buffer, a_Field); });
+	std::size_t currentOffset = 0;
+	std::uint64_t dataRaw = 0;
+	boost::pfr::for_each_field(a_MessageData,
+		[&buffer, &dataRaw, &currentOffset](const auto& a_Field) { WriteField(buffer, a_Field, dataRaw, currentOffset); });
 	return buffer;
 }
 
 template <typename TData>
 void ReadMessage(DataBuffer& a_Buffer, TData& a_MessageData) {
-	boost::pfr::for_each_field(a_MessageData, [&a_Buffer](auto& a_Field) { ReadField(a_Buffer, a_Field); });
+	std::size_t currentOffset = 0;
+	boost::pfr::for_each_field(a_MessageData, [&a_Buffer, &currentOffset](auto& a_Field) { ReadField(a_Buffer, a_Field, currentOffset); });
 }
 
 }  // namespace details

include/sp/protocol/BitField.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <cstdint>
+
+namespace sp {
+
+template <typename T, std::size_t BitSize>
+class BitField {
+  private:
+	static constexpr int BITS_IN_CHAR = 8;
+	static_assert(sizeof(T) * BITS_IN_CHAR > BitSize, "The bit count must be lower than the actual type size !");
+
+	T m_Data;
+
+  public:
+	BitField() : m_Data{} {};
+	BitField(T a_Data) : m_Data(a_Data) {}
+
+	BitField& operator=(T a_Data) {
+		m_Data = a_Data;
+		return *this;
+	}
+
+	constexpr std::size_t GetBitSize() const {
+		return BitSize;
+	}
+
+	T& operator*() {
+		return m_Data;
+	}
+
+	const T& operator*() const {
+		return m_Data;
+	}
+};
+
+}  // namespace sp

test/test_message.cpp

@@ -4,6 +4,7 @@
 #include <sp/protocol/MessageHandler.h>
 #include <sp/io/MessageStream.h>
 #include <sp/io/StdIo.h>
+#include <sp/protocol/BitField.h>
 
 #include <sp/extensions/Compress.h>
 
@@ -21,8 +22,8 @@ template <typename TData, PacketID ID>
 using Message = sp::ConcreteMessage<TData, PacketID, ID, PacketHandler>;
 
 struct KeepAlivePacket {
-	std::uint64_t m_KeepAlive;
+	sp::BitField<std::uint16_t, 12> one;
-	std::string mdc;
+	sp::BitField<std::uint16_t, 4> two;
 };
 
 using KeepAliveMessage = Message<KeepAlivePacket, PacketID::KeepAlive>;
@@ -34,7 +35,7 @@ class PacketHandler : public sp::MessageHandler<AllMessages> {};
 class MyHandler : public PacketHandler {
   public:
 	virtual void Handle(const KeepAlivePacket& msg) {
-		std::cout << "I recieved a keep alive : " << msg.m_KeepAlive << " : " << msg.mdc << "\n";
+		std::cout << "I recieved a keep alive : " << *msg.one << " : " << *msg.two << "\n";
 	}
 };
 
@@ -45,7 +46,7 @@ using PacketFactory = sp::MessageFactory<PacketBase, AllMessages>;
 using PacketStream = sp::MessageStream<PacketFactory>;
 
 int main() {
-	KeepAliveMessage m{69UL, "ceci est une mdc aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"};
+	KeepAliveMessage m{69, 5};
 
 	// dispatch tests
 
@@ -79,6 +80,8 @@ int main() {
 
 	d.Dispatch(*message2);
 
+	// Todo : verify bitfields
+
 	// message->Write(file);
 	// file << std::endl;
 	// m.Write(file);