Skip to content
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

Jump to bottom

refactor: explicit hasStackTraces() in FPE #3727

Merged
merged 4 commits into from
Oct 18, 2024
Merged

refactor: explicit hasStackTraces() in FPE #3727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ce6116
typo
AJPfleger Oct 12, 2024
5174b29
explicit
AJPfleger Oct 12, 2024
325748c
review paulgessinger
AJPfleger Oct 12, 2024
b9f90f6
Merge branch 'main' into fpe-clean
kodiakhq[bot] Oct 18, 2024
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
2 changes: 1 addition & 1 deletion Examples/Framework/src/Framework/Sequencer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ void Sequencer::fpeReport() const {
auto merged = std::accumulate(
fpe.begin(), fpe.end(), Acts::FpeMonitor::Result{},
[](const auto& lhs, const auto& rhs) { return lhs.merged(rhs); });
if (!merged) {
if (!merged.hasStackTraces()) {
// no FPEs to report
continue;
}
Expand Down
6 changes: 3 additions & 3 deletions Plugins/FpeMonitoring/include/Acts/Plugins/FpeMonitoring/FpeMonitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ std::ostream &operator<<(std::ostream &os, FpeType type);
class FpeMonitor {
public:
struct Buffer {
Buffer(std::size_t bufferSize)
explicit Buffer(std::size_t bufferSize)
: m_data{std::make_unique<std::byte[]>(bufferSize)},
m_size{bufferSize} {}

Expand Down Expand Up @@ -105,12 +105,12 @@ class FpeMonitor {

Result() = default;

operator bool() const { return !m_stracktraces.empty(); }
bool hasStackTraces() const { return !m_stackTraces.empty(); }

void add(Acts::FpeType type, void *stackPtr, std::size_t bufferSize);

private:
std::vector<FpeInfo> m_stracktraces;
std::vector<FpeInfo> m_stackTraces;
std::array<unsigned int, 32> m_counts{};

friend FpeMonitor;
Expand Down
34 changes: 17 additions & 17 deletions Plugins/FpeMonitoring/src/FpeMonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ FpeMonitor::Result FpeMonitor::Result::merged(const Result &with) const {
result.m_counts[i] = m_counts[i] + with.m_counts[i];
}

std::copy(with.m_stracktraces.begin(), with.m_stracktraces.end(),
std::back_inserter(result.m_stracktraces));
std::copy(m_stracktraces.begin(), m_stracktraces.end(),
std::back_inserter(result.m_stracktraces));
std::copy(with.m_stackTraces.begin(), with.m_stackTraces.end(),
std::back_inserter(result.m_stackTraces));
std::copy(m_stackTraces.begin(), m_stackTraces.end(),
std::back_inserter(result.m_stackTraces));

result.deduplicate();

Expand All @@ -76,8 +76,8 @@ void FpeMonitor::Result::merge(const Result &with) {
m_counts[i] = m_counts[i] + with.m_counts[i];
}

std::copy(with.m_stracktraces.begin(), with.m_stracktraces.end(),
std::back_inserter(m_stracktraces));
std::copy(with.m_stackTraces.begin(), with.m_stackTraces.end(),
std::back_inserter(m_stackTraces));

deduplicate();
}
Expand All @@ -87,20 +87,20 @@ void FpeMonitor::Result::add(FpeType type, void *stackPtr,
auto st = std::make_unique<boost::stacktrace::stacktrace>(
boost::stacktrace::stacktrace::from_dump(stackPtr, bufferSize));

auto it = std::ranges::find_if(m_stracktraces, [&](const FpeInfo &el) {
auto it = std::ranges::find_if(m_stackTraces, [&](const FpeInfo &el) {
return areFpesEquivalent({el.type, *el.st}, {type, *st});
});

if (it != m_stracktraces.end()) {
if (it != m_stackTraces.end()) {
it->count += 1;
} else {
m_stracktraces.push_back({1, type, std::move(st)});
m_stackTraces.push_back({1, type, std::move(st)});
}
}

bool FpeMonitor::Result::contains(
FpeType type, const boost::stacktrace::stacktrace &st) const {
return std::ranges::any_of(m_stracktraces, [&](const FpeInfo &el) {
return std::ranges::any_of(m_stackTraces, [&](const FpeInfo &el) {
return areFpesEquivalent({el.type, *el.st}, {type, st});
});
}
Expand Down Expand Up @@ -128,12 +128,12 @@ unsigned int FpeMonitor::Result::count(FpeType type) const {
}

unsigned int FpeMonitor::Result::numStackTraces() const {
return m_stracktraces.size();
return m_stackTraces.size();
}

const std::vector<FpeMonitor::Result::FpeInfo> &
FpeMonitor::Result::stackTraces() const {
return m_stracktraces;
return m_stackTraces;
}

bool FpeMonitor::Result::encountered(FpeType type) const {
Expand Down Expand Up @@ -161,18 +161,18 @@ void FpeMonitor::Result::summary(std::ostream &os, std::size_t depth) const {

void FpeMonitor::Result::deduplicate() {
std::vector<FpeInfo> copy{};
copy = std::move(m_stracktraces);
m_stracktraces.clear();
copy = std::move(m_stackTraces);
m_stackTraces.clear();

for (auto &info : copy) {
auto it = std::ranges::find_if(m_stracktraces, [&info](const FpeInfo &el) {
auto it = std::ranges::find_if(m_stackTraces, [&info](const FpeInfo &el) {
return areFpesEquivalent({el.type, *el.st}, {info.type, *info.st});
});
if (it != m_stracktraces.end()) {
if (it != m_stackTraces.end()) {
it->count += info.count;
continue;
}
m_stracktraces.push_back({info.count, info.type, std::move(info.st)});
m_stackTraces.push_back({info.count, info.type, std::move(info.st)});
}
}

Expand Down
Loading