Skip to content

Add compatibility with std::pmr #14379

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
ktf merged 1 commit into from
Jun 12, 2025
Merged

Add compatibility with std::pmr #14379

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
1 change: 0 additions & 1 deletion Utilities/DataSampling/include/DataSampling/Dispatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ class Dispatcher : public framework::Task

private:
DataSamplingHeader prepareDataSamplingHeader(const DataSamplingPolicy& policy, header::DataHeader const& original);
header::Stack extractAdditionalHeaders(const char* inputHeaderStack) const;
void reportStats(monitoring::Monitoring& monitoring) const;
void send(framework::DataAllocator& dataAllocator, const framework::DataRef& inputData, const framework::Output& output) const;

Expand Down
54 changes: 38 additions & 16 deletions Utilities/DataSampling/src/Dispatcher.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include <Configuration/ConfigurationInterface.h>
#include <Configuration/ConfigurationFactory.h>
#include <stdexcept>

using namespace o2::configuration;
using namespace o2::monitoring;
Expand Down Expand Up @@ -77,6 +78,42 @@ void Dispatcher::init(InitContext& ctx)
mDeviceID.runtimeInit(spec.id.substr(0, DataSamplingHeader::deviceIDTypeSize).c_str());
}

header::Stack extractAdditionalHeaders(const char* inputHeaderStack)
{
std::array<header::BaseHeader const*, 5> headers;
Copy link
Collaborator

@knopers8 knopers8 Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ktf here, you used 5, but the code below supports up to 8. A typo?

Copy link
Member Author

@ktf ktf Jun 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. It used to be 5 and I then changed it to 8. Will fix this.

int count = 0;
const auto* first = header::BaseHeader::get(reinterpret_cast<const std::byte*>(inputHeaderStack));
for (const auto* current = first; current != nullptr; current = current->next()) {
if (current->description != header::DataHeader::sHeaderType && current->description != DataProcessingHeader::sHeaderType) {
headers[count++] = current;
}
}

// Poor man runtime pack expansion.
switch (count) {
case 0:
return header::Stack{};
case 1:
return header::Stack{*headers[0]};
case 2:
return header::Stack{*headers[0], *headers[1]};
case 3:
return header::Stack{*headers[0], *headers[1], *headers[2]};
case 4:
return header::Stack{*headers[0], *headers[1], *headers[2], *headers[3]};
case 5:
return header::Stack{*headers[0], *headers[1], *headers[2], *headers[3], *headers[4]};
case 6:
return header::Stack{*headers[0], *headers[1], *headers[2], *headers[3], *headers[4], *headers[5]};
case 7:
return header::Stack{*headers[0], *headers[1], *headers[2], *headers[3], *headers[4], *headers[5], *headers[6]};
case 8:
return header::Stack{*headers[0], *headers[1], *headers[2], *headers[3], *headers[4], *headers[5], *headers[6], *headers[7]};
default:
throw std::runtime_error(fmt::format("Too many headers to copy {}", count));
}
}

void Dispatcher::run(ProcessingContext& ctx)
{
// todo: consider matching (and deciding) in completion policy to save some time
Expand Down Expand Up @@ -106,7 +143,7 @@ void Dispatcher::run(ProcessingContext& ctx)
// so that custom data-dependent headers are passed forward,
// and we add a DataSamplingHeader.
header::Stack headerStack{
std::move(extractAdditionalHeaders(part.header)),
extractAdditionalHeaders(part.header),
dsheader};
const auto* partInputHeader = DataRefUtils::getHeader<header::DataHeader*>(part);

Expand Down Expand Up @@ -156,21 +193,6 @@ DataSamplingHeader Dispatcher::prepareDataSamplingHeader(const DataSamplingPolic
original};
}

header::Stack Dispatcher::extractAdditionalHeaders(const char* inputHeaderStack) const
{
header::Stack headerStack;

const auto* first = header::BaseHeader::get(reinterpret_cast<const std::byte*>(inputHeaderStack));
for (const auto* current = first; current != nullptr; current = current->next()) {
if (current->description != header::DataHeader::sHeaderType &&
current->description != DataProcessingHeader::sHeaderType) {
headerStack = std::move(header::Stack{std::move(headerStack), *current});
}
}

return headerStack;
}

void Dispatcher::send(DataAllocator& dataAllocator, const DataRef& inputData, const Output& output) const
{
const auto* inputHeader = DataRefUtils::getHeader<header::DataHeader*>(inputData);
Expand Down