Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions Framework/Core/include/Framework/DataProcessingStats.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ struct DataProcessingStats {
std::array<MetricSpec, MAX_METRICS> metricSpecs = {};
std::array<int64_t, MAX_METRICS> lastPublishedMetrics = {};
std::vector<int> availableMetrics;
// for fast check for AVAILABLE_MANAGED_SHM metric which is only provided for readout-proxy
bool hasAvailSHMMetric = false;
// How many commands have been committed to the queue.
std::atomic<int> insertedCmds = 0;
// The insertion point for the next command.
Expand Down
13 changes: 7 additions & 6 deletions Framework/Core/src/CommonServices.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -764,11 +764,8 @@ auto sendRelayerMetrics(ServiceRegistryRef registry, DataProcessingStats& stats)
using namespace fair::mq::shmem;
auto& spec = registry.get<DeviceSpec const>();

auto hasMetric = [&runningWorkflow](const DataProcessingStats::MetricSpec& metric) -> bool {
return metric.metricId == static_cast<int>(ProcessingStatsId::AVAILABLE_MANAGED_SHM_BASE) + (runningWorkflow.shmSegmentId % 512);
};
// FIXME: Ugly, but we do it only every 5 seconds...
if (std::find_if(stats.metricSpecs.begin(), stats.metricSpecs.end(), hasMetric) != stats.metricSpecs.end()) {
if (stats.hasAvailSHMMetric) {
auto device = registry.get<RawDeviceService>().device();
long freeMemory = -1;
try {
Expand Down Expand Up @@ -1104,8 +1101,12 @@ o2::framework::ServiceSpec CommonServices::dataProcessingStats()
.sendInitialValue = true}};

for (auto& metric : metrics) {
if (metric.metricId == (int)ProcessingStatsId::AVAILABLE_MANAGED_SHM_BASE + (runningWorkflow.shmSegmentId % 512) && spec.name.compare("readout-proxy") != 0) {
continue;
if (metric.metricId == (int)ProcessingStatsId::AVAILABLE_MANAGED_SHM_BASE + (runningWorkflow.shmSegmentId % 512)) {
if (spec.name.compare("readout-proxy") == 0) {
stats->hasAvailSHMMetric = true;
} else {
continue;
}
}
stats->registerMetric(metric);
}
Expand Down