Persson-dev/Simple-Protocol-Lib
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

refactor bitfield io

Browse Source
This commit is contained in:
Simon Pribylski
2025-07-29 14:52:22 +02:00
parent 366a40afee
commit 01e406cd89
8 changed files with 182 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
include/sp/io/MessageIO.h
View File

@@ -1,78 +1,53 @@
#pragma once
#include <boost/pfr.hpp>
#include <sp/common/ByteSwapping.h>
#include <sp/common/DataBuffer.h>
#include <sp/protocol/BitField.h>
#include <sp/io/BitBuffer.h>
namespace sp {
namespace details {
template <typename T, std::size_t BitSize>
void WriteField(DataBuffer& a_Buffer, const BitField<T, BitSize>& a_Data, BitBuffer& a_BitBuffer) {
a_BitBuffer.Append<T, BitSize>(*a_Data);
a_BitBuffer.UpdateWrite(true);
}
template <typename T>
void WriteBitField(DataBuffer& a_Buffer, std::uint64_t& a_DataRaw, std::size_t& a_Offset) {
T filled = static_cast<T>(a_DataRaw);
ToNetwork(filled);
a_Buffer << filled;
a_Offset = 0;
a_DataRaw = 0;
void WriteField(DataBuffer& a_Buffer, const T& a_Data, BitBuffer& a_BitBuffer) {
a_Buffer << a_Data;
a_BitBuffer.UpdateWrite(false);
}
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) {
WriteBitField<T>(a_Buffer, a_DataRaw, a_Offset);
}
void ReadField(DataBuffer& a_Buffer, BitField<T, BitSize>& a_Data, BitBuffer& a_BitBuffer) {
a_BitBuffer.Read<T, BitSize>(*a_Data);
a_BitBuffer.UpdateRead(true);
}
template <typename T>
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, std::size_t& a_Offset) {
void ReadField(DataBuffer& a_Buffer, T& a_Data, BitBuffer& a_BitBuffer) {
a_Buffer >> a_Data;
FromNetwork(a_Data);
a_BitBuffer.UpdateRead(false);
}
} // namespace details
template <typename TData>
DataBuffer WriteMessage(const TData& a_MessageData) {
DataBuffer buffer;
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); });
BitBuffer bitBuffer(buffer);
boost::pfr::for_each_field(
a_MessageData, [&buffer, &bitBuffer](const auto& a_Field) { details::WriteField(buffer, a_Field, bitBuffer); });
bitBuffer.UpdateWrite(false);
return buffer;
}
template <typename TData>
void ReadMessage(DataBuffer& a_Buffer, TData& a_MessageData) {
std::size_t currentOffset = 0;
BitBuffer bitBuffer(a_Buffer);
boost::pfr::for_each_field(
a_MessageData, [&a_Buffer, &currentOffset](auto& a_Field) { ReadField(a_Buffer, a_Field, currentOffset); });
a_MessageData, [&a_Buffer, &bitBuffer](auto& a_Field) { details::ReadField(a_Buffer, a_Field, bitBuffer); });
bitBuffer.UpdateRead(false);
}
} // namespace details
} // namespace sp