Skip to content

Bugfix: set the next-header flag correctly in a stack as parameter #1076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthiasrichter merged 1 commit into from
May 17, 2018
Merged

Bugfix: set the next-header flag correctly in a stack as parameter #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions DataFormats/Headers/include/Headers/DataHeader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,21 +387,35 @@ struct BaseHeader
///
/// this is to guess if the buffer starting at b looks like a header
inline static const BaseHeader* get(const byte* b, size_t /*len*/=0) {
return (*(reinterpret_cast<const uint32_t*>(b))==sMagicString) ?
reinterpret_cast<const BaseHeader*>(b) :
nullptr;
return (b != nullptr && *(reinterpret_cast<const uint32_t*>(b)) == sMagicString)
? reinterpret_cast<const BaseHeader*>(b)
: nullptr;
}

/// @brief access header in buffer
///
/// this is to guess if the buffer starting at b looks like a header
inline static BaseHeader* get(byte* b, size_t /*len*/ = 0)
{
return (b != nullptr && *(reinterpret_cast<uint32_t*>(b)) == sMagicString) ? reinterpret_cast<BaseHeader*>(b)
: nullptr;
}

inline uint32_t size() const noexcept { return headerSize; }
inline const byte* data() const noexcept { return reinterpret_cast<const byte*>(this); }

/// get the next header if any
/// get the next header if any (const version)
inline const BaseHeader* next() const noexcept {
return (flagsNextHeader) ?
reinterpret_cast<const BaseHeader*>(reinterpret_cast<const byte*>(this)+headerSize) :
nullptr;
}

/// get the next header if any (non-const version)
inline BaseHeader* next() noexcept
{
return (flagsNextHeader) ? reinterpret_cast<BaseHeader*>(reinterpret_cast<byte*>(this) + headerSize) : nullptr;
}
};

/// find a header of type HeaderType in a buffer
Expand Down Expand Up @@ -500,14 +514,21 @@ struct Stack {

template<typename T>
static byte* inject(byte* here, const T& h) noexcept {
static_assert(std::is_base_of<BaseHeader, T>::value == true || std::is_same<Stack, T>::value == true,
"header stack parameters are restricted to stacks and headers derived from BaseHeader");
std::copy(h.data(), h.data()+h.size(), here);
return here + h.size();
}

template<typename T, typename... Args>
static byte* inject(byte* here, const T& h, const Args... args) noexcept {
auto alsohere = inject(here, h);
(reinterpret_cast<BaseHeader*>(here))->flagsNextHeader = true;
// the type might be a stack itself, loop through headers and set the flag in the last one
BaseHeader* next = BaseHeader::get(here);
while (next->flagsNextHeader) {
next = next->next();
}
next->flagsNextHeader = true;
return inject(alsohere, args...);
}
};
Expand Down
34 changes: 34 additions & 0 deletions DataFormats/Headers/test/testDataHeader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,29 @@
using system_clock = std::chrono::system_clock;
using TimeScale = std::chrono::nanoseconds;

namespace o2
{
namespace header
{
namespace test
{
struct MetaHeader : public BaseHeader {
// Required to do the lookup
static const o2::header::HeaderType sHeaderType;
static const uint32_t sVersion = 1;

MetaHeader(uint32_t v)
: BaseHeader(sizeof(MetaHeader), sHeaderType, o2::header::gSerializationMethodNone, sVersion), secret(v)
{
}

uint64_t secret;
};
constexpr o2::header::HeaderType MetaHeader::sHeaderType = "MetaHead";
}
}
}

namespace o2 {
namespace header {

Expand Down Expand Up @@ -176,6 +199,17 @@ namespace o2 {
BOOST_CHECK(h2->serialization == gSerializationMethodNone);
BOOST_CHECK(h2->size() == sizeof(NameHeader<9>));
BOOST_CHECK(h2->getNameLength() == 9);

auto meta = test::MetaHeader{ 42 };
Stack s2{ s1, meta };
BOOST_CHECK(s2.size() == s1.size() + sizeof(decltype(meta)));

auto* h3 = get<test::MetaHeader*>(s1.data());
BOOST_CHECK(h3 == nullptr);
h3 = get<test::MetaHeader*>(s2.data());
BOOST_CHECK(h3 != nullptr);
h1 = get<DataHeader*>(s2.data());
BOOST_CHECK(h1 != nullptr);
}

BOOST_AUTO_TEST_CASE(Descriptor_benchmark)
Expand Down