Skip to content

DPL: get rid of MessageSet::pairMap #15237

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
Mar 29, 2026
+3 −11
Merged

DPL: get rid of MessageSet::pairMap #15237

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
14 changes: 3 additions & 11 deletions Framework/Core/include/Framework/MessageSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,21 @@ struct MessageSet {
// payload index within the O2 message
size_t payloadIndex = 0;
};
std::vector<PairMapping> pairMap;

MessageSet()
: messages(), messageMap(), pairMap()
: messages(), messageMap()
{
}

template <typename F>
MessageSet(F getter, size_t size)
: messages(), messageMap(), pairMap()
: messages(), messageMap()
{
add(std::forward<F>(getter), size);
}

MessageSet(MessageSet&& other)
: messages(std::move(other.messages)), messageMap(std::move(other.messageMap)), pairMap(std::move(other.pairMap))
: messages(std::move(other.messages)), messageMap(std::move(other.messageMap))
{
other.clear();
}
Expand All @@ -77,7 +76,6 @@ struct MessageSet {
}
messages = std::move(other.messages);
messageMap = std::move(other.messageMap);
pairMap = std::move(other.pairMap);
other.clear();
return *this;
}
Expand All @@ -99,7 +97,6 @@ struct MessageSet {
{
messages.clear();
messageMap.clear();
pairMap.clear();
}

// this is more or less legacy
Expand All @@ -116,7 +113,6 @@ struct MessageSet {
// add content of the part ref
void add(PartRef&& ref)
{
pairMap.emplace_back(messageMap.size(), 0);
messageMap.emplace_back(messages.size(), 1);
messages.emplace_back(std::move(ref.header));
messages.emplace_back(std::move(ref.payload));
Expand All @@ -126,12 +122,8 @@ struct MessageSet {
template <typename F>
void add(F getter, size_t size)
{
auto partid = messageMap.size();
messageMap.emplace_back(messages.size(), size - 1);
for (size_t i = 0; i < size; ++i) {
if (i > 0) {
pairMap.emplace_back(partid, i - 1);
}
messages.emplace_back(std::move(getter(i)));
}
}
Expand Down
Loading