DPL: refactor internal details of ResourcesMonitoringHelper

No need to expose getter / setters to the outside.
AliceO2Group · Dec 14, 2020 · 00d2046 · 00d2046
1 parent 46995d6
commit 00d2046
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 34 deletions.
diff --git a/Framework/Core/src/ResourcesMonitoringHelper.cxx b/Framework/Core/src/ResourcesMonitoringHelper.cxx
@@ -18,6 +18,38 @@
 
 using namespace o2::framework;
 
+template <typename T>
+inline static T retriveValue(T val)
+{
+  return val;
+}
+
+inline static std::string retriveValue(const std::reference_wrapper<const StringMetric> val)
+{
+  return std::string(val.get().data);
+}
+
+template <typename T>
+boost::property_tree::ptree fillNodeWithValue(const DeviceMetricsInfo& deviceMetrics,
+                                              const T& metricsStorage, size_t labelIndex, size_t storageIndex)
+{
+
+  unsigned int loopRange = std::min(deviceMetrics.metrics[labelIndex].filledMetrics, metricsStorage[storageIndex].size());
+  boost::property_tree::ptree metricNode;
+
+  for (unsigned int idx = 0; idx < loopRange; ++idx) {
+    boost::property_tree::ptree values;
+    values.add("timestamp", deviceMetrics.timestamps[labelIndex][idx]);
+    if constexpr (std::is_arithmetic_v<T>) {
+      values.add("value", std::to_string(retriveValue(std::cref(metricsStorage[storageIndex][idx]))));
+    } else {
+      values.add("value", retriveValue(std::cref(metricsStorage[storageIndex][idx])));
+    }
+    metricNode.push_back(std::make_pair("", values));
+  }
+  return metricNode;
+}
+
 bool ResourcesMonitoringHelper::dumpMetricsToJSON(const std::vector<DeviceMetricsInfo>& metrics,
                                                   const DeviceMetricsInfo& driverMetrics,
                                                   const std::vector<DeviceSpec>& specs,

diff --git a/Framework/Core/src/ResourcesMonitoringHelper.h b/Framework/Core/src/ResourcesMonitoringHelper.h
@@ -30,42 +30,8 @@ struct ResourcesMonitoringHelper {
                                 std::vector<DeviceSpec> const& specs,
                                 std::vector<std::string> const& metricsToDump) noexcept;
   static bool isResourcesMonitoringEnabled(unsigned short interval) noexcept { return interval > 0; }
-
-  template <typename T>
-  static boost::property_tree::ptree fillNodeWithValue(const DeviceMetricsInfo& deviceMetrics,
-                                                       const T& metricsStorage, size_t labelIndex, size_t storageIndex);
-
-  template <typename T>
-  inline static T retriveValue(T val)
-  {
-    return val;
-  }
-  inline static std::string retriveValue(const std::reference_wrapper<const StringMetric> val)
-  {
-    return std::string(val.get().data);
-  }
 };
 
-template <typename T>
-boost::property_tree::ptree ResourcesMonitoringHelper::fillNodeWithValue(const DeviceMetricsInfo& deviceMetrics,
-                                                                         const T& metricsStorage, size_t labelIndex, size_t storageIndex)
-{
-
-  unsigned int loopRange = std::min(deviceMetrics.metrics[labelIndex].filledMetrics, metricsStorage[storageIndex].size());
-  boost::property_tree::ptree metricNode;
-
-  for (unsigned int idx = 0; idx < loopRange; ++idx) {
-    boost::property_tree::ptree values;
-    values.add("timestamp", deviceMetrics.timestamps[labelIndex][idx]);
-    if constexpr (std::is_arithmetic_v<T>) {
-      values.add("value", std::to_string(retriveValue(std::cref(metricsStorage[storageIndex][idx]))));
-    } else {
-      values.add("value", retriveValue(std::cref(metricsStorage[storageIndex][idx])));
-    }
-    metricNode.push_back(std::make_pair("", values));
-  }
-  return metricNode;
-}
 
 } // namespace o2::framework