Skip to content

DPL: using linear message store for the DataRelayer cache #7533

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
Nov 6, 2021
+32 −66
Merged

DPL: using linear message store for the DataRelayer cache #7533

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
96 changes: 31 additions & 65 deletions Framework/Core/include/Framework/MessageSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,28 @@ namespace framework

/// A set of associated inflight messages.
struct MessageSet {
std::vector<PartRef> parts;
struct Index {
Index(size_t p, size_t s) : position(p), size(s) {}
size_t position = 0;
size_t size = 0;
};
std::vector<FairMQMessagePtr> messages;
std::vector<Index> index;

@ktf ktf Nov 5, 2021

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you remind why we need the index at all?

@matthiasrichter matthiasrichter Nov 5, 2021

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

this will contain the length of the message train, so we have the position in the linear vector and the number of messages for a particular part (header plus n payloads)


MessageSet()
: parts()
: messages(), index()
{
}

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

MessageSet(MessageSet&& other)
: parts(std::move(other.parts))
: messages(std::move(other.messages)), index(std::move(other.index))
{
other.clear();
}
Expand All @@ -48,25 +54,26 @@ struct MessageSet {
if (&other == this) {
return *this;
}
parts = std::move(other.parts);
messages = std::move(other.messages);
index = std::move(other.index);
other.clear();
return *this;
}

size_t size() const
{
return parts.size();
return index.size();
}

size_t getNumberOfPayloads(size_t part) const
{
// this is for upcoming change of message store
return 1;
return index[part].size;
}

void clear()
{
parts.clear();
messages.clear();
index.clear();
}

// this is more or less legacy
Expand All @@ -78,83 +85,42 @@ struct MessageSet {

void add(PartRef&& ref)
{
parts.emplace_back(std::move(ref));
index.emplace_back(messages.size(), 1);
messages.emplace_back(std::move(ref.header));
messages.emplace_back(std::move(ref.payload));
}

template <typename F>
void add(F getter, size_t size)
{
index.emplace_back(messages.size(), size - 1);
for (size_t i = 0; i < size; ++i) {
PartRef ref{std::move(getter(i)), std::move(getter(i + 1))};
parts.emplace_back(std::move(ref));
++i;
messages.emplace_back(std::move(getter(i)));
}
}

FairMQMessagePtr& header(size_t partIndex)
{
assert(partIndex < parts.size());
return parts[partIndex].header;
return messages[index[partIndex].position];
}

FairMQMessagePtr& payload(size_t partIndex, size_t payloadIndex = 0)
{
assert(partIndex < parts.size());
// payload index will be supported in linear message store
assert(payloadIndex == 0);
return parts[partIndex].payload;
assert(partIndex < index.size());
assert(index[partIndex].position + payloadIndex + 1 < messages.size());
return messages[index[partIndex].position + payloadIndex + 1];
}

FairMQMessagePtr const& header(size_t partIndex) const
{
assert(partIndex < parts.size());
return parts[partIndex].header;
return messages[index[partIndex].position];
}

FairMQMessagePtr const& payload(size_t partIndex) const
FairMQMessagePtr const& payload(size_t partIndex, size_t payloadIndex = 0) const
{
assert(partIndex < parts.size());
return parts[partIndex].payload;
}

PartRef& operator[](size_t index)
{
return parts[index];
}

PartRef const& operator[](size_t index) const
{
return parts[index];
}

PartRef& at(size_t index)
{
return parts.at(index);
}

PartRef const& at(size_t index) const
{
return parts.at(index);
}

decltype(auto) begin()
{
return parts.begin();
}

decltype(auto) begin() const
{
return parts.begin();
}

decltype(auto) end()
{
return parts.end();
}

decltype(auto) end() const
{
return parts.end();
assert(partIndex < index.size());
assert(index[partIndex].position + payloadIndex + 1 < messages.size());
return messages[index[partIndex].position + payloadIndex + 1];
}
};

Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/src/DataRelayer.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ std::vector<o2::framework::MessageSet> DataRelayer::getInputsForTimeslice(Timesl
// FIXME: what happens when we have enough timeslices to hit the invalid one?
auto invalidateCacheFor = [&numInputTypes, &cachedStateMetrics = mCachedStateMetrics, &index, &cache](TimesliceSlot s) {
for (size_t ai = s.index * numInputTypes, ae = ai + numInputTypes; ai != ae; ++ai) {
assert(std::accumulate(cache[ai].begin(), cache[ai].end(), true, [](bool result, auto const& element) { return result && element.header.get() == nullptr && element.payload.get() == nullptr; }));
assert(std::accumulate(cache[ai].messages.begin(), cache[ai].messages.end(), true, [](bool result, auto const& element) { return result && element.get() == nullptr; }));
cache[ai].clear();
}
index.markAsInvalid(s);
Expand Down