Skip to content

DPL: move away from MessageSet::header / payload #15228

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 2 commits into from
Mar 27, 2026
+16 −8
Merged

DPL: move away from MessageSet::header / payload #15228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed42a58
DPL: more validation of MessageSet::header / payload replacement
ktf Mar 26, 2026
f607094
DPL: move away from MessageSet::header / payload
ktf Mar 26, 2026
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
16 changes: 8 additions & 8 deletions Framework/Core/src/DataRelayer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ DataRelayer::ActivityStats DataRelayer::processDanglingInputs(std::vector<Expira
auto partial = getPartialRecord(ti);
// TODO: get the data ref from message model
auto getter = [&partial](size_t idx, size_t part) {
if (!partial[idx].messages.empty() && partial[idx].header(part).get()) {
auto header = partial[idx].header(part).get();
auto payload = partial[idx].payload(part).get();
if (!partial[idx].messages.empty() && (partial[idx].messages | get_header{part}).get()) {
auto header = (partial[idx].messages | get_header{part}).get();
auto payload = (partial[idx].messages | get_payload{part, 0}).get();
return DataRef{nullptr,
reinterpret_cast<const char*>(header->GetData()),
reinterpret_cast<char const*>(payload ? payload->GetData() : nullptr),
Expand Down Expand Up @@ -786,9 +786,9 @@ void DataRelayer::getReadyToProcess(std::vector<DataRelayer::RecordAction>& comp
auto partial = getPartialRecord(li);
// TODO: get the data ref from message model
auto getter = [&partial](size_t idx, size_t part) {
if (!partial[idx].messages.empty() && partial[idx].header(part).get()) {
auto header = partial[idx].header(part).get();
auto payload = partial[idx].payload(part).get();
if (!partial[idx].messages.empty() && (partial[idx].messages | get_header{part}).get()) {
auto header = (partial[idx].messages | get_header{part}).get();
auto payload = (partial[idx].messages | get_payload{part, 0}).get();
return DataRef{nullptr,
reinterpret_cast<const char*>(header->GetData()),
reinterpret_cast<char const*>(payload ? payload->GetData() : nullptr),
Expand Down Expand Up @@ -952,10 +952,10 @@ std::vector<o2::framework::MessageSet> DataRelayer::consumeExistingInputsForTime
// TODO: in the original implementation of the cache, there have been only two messages per entry,
// check if the 2 above corresponds to the number of messages.
for (size_t pi = 0; pi < (cache[cacheId].messages | count_parts{}); pi++) {
auto& header = cache[cacheId].header(pi);
auto& header = cache[cacheId].messages | get_header{pi};
auto&& newHeader = header->GetTransport()->CreateMessage();
newHeader->Copy(*header);
messages[arg].add(PartRef{std::move(newHeader), std::move(cache[cacheId].payload(pi))});
messages[arg].add(PartRef{std::move(newHeader), std::move(cache[cacheId].messages | get_payload{pi, 0})});
}
};

Expand Down
8 changes: 8 additions & 0 deletions Framework/Core/test/test_MessageSet.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,14 @@ TEST_CASE("GetHeaderPayloadOperators")
auto& pl1 = msgSet.messages | get_payload{1, 0};
REQUIRE(pl1.get() != nullptr);
REQUIRE(pl1->GetSize() == 200);

// Validate pipe operators match old API
for (size_t i = 0; i < 2; ++i) {
REQUIRE(&(msgSet.messages | get_header{i}) == &msgSet.header(i));
REQUIRE(&(msgSet.messages | get_payload{i, 0}) == &msgSet.payload(i, 0));
}
REQUIRE((msgSet.messages | count_parts{}) == msgSet.messageMap.size());
REQUIRE((msgSet.messages | count_payloads{}) == msgSet.pairMap.size());
}

TEST_CASE("GetHeaderPayloadMultiPayload")
Expand Down
Loading