diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-15 12:47:01 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-15 13:12:37 +0100 |
commit | d7328b4a31cba1f7c99366e7f8ad1f0ee709d048 (patch) | |
tree | 59c801c5a5184b785794b36be5ef74ea94256f36 /metrics | |
parent | 6409f3bcc0ae7fafa057fdd94a5025d25a69769c (diff) |
Complete the split also for tests.
Diffstat (limited to 'metrics')
-rw-r--r-- | metrics/src/vespa/metrics/loadmetric.h | 15 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/loadmetric.hpp | 17 |
2 files changed, 18 insertions, 14 deletions
diff --git a/metrics/src/vespa/metrics/loadmetric.h b/metrics/src/vespa/metrics/loadmetric.h index 1ab726a844c..d31ef5efca4 100644 --- a/metrics/src/vespa/metrics/loadmetric.h +++ b/metrics/src/vespa/metrics/loadmetric.h @@ -56,20 +56,7 @@ public: MetricType& operator[](const LoadType& type) { return getMetric(type); } const MetricType& operator[](const LoadType& type) const { return const_cast<LoadMetric<MetricType>*>(this)->getMetric(type); } - MetricType& getMetric(const LoadType& type) { - MetricType* metric; - - typename vespalib::hash_map<uint32_t, MetricTypeLP>::iterator it( - _metrics.find(type.getId())); - if (it == _metrics.end()) { - it = _metrics.find(0); - assert(it != _metrics.end()); // Default should always exist - } - metric = it->second.get(); - assert(metric); - - return *metric; - } + MetricType& getMetric(const LoadType& type); void addMemoryUsage(MemoryConsumption& mc) const override; }; diff --git a/metrics/src/vespa/metrics/loadmetric.hpp b/metrics/src/vespa/metrics/loadmetric.hpp index e1faa756be1..54171341b67 100644 --- a/metrics/src/vespa/metrics/loadmetric.hpp +++ b/metrics/src/vespa/metrics/loadmetric.hpp @@ -69,6 +69,23 @@ LoadMetric<MetricType>::clone(std::vector<Metric::LP>& ownerList, } template<typename MetricType> +MetricType& +LoadMetric<MetricType>::getMetric(const LoadType& type) { + MetricType* metric; + + typename vespalib::hash_map<uint32_t, MetricTypeLP>::iterator it( + _metrics.find(type.getId())); + if (it == _metrics.end()) { + it = _metrics.find(0); + assert(it != _metrics.end()); // Default should always exist + } + metric = it->second.get(); + assert(metric); + + return *metric; +} + +template<typename MetricType> void LoadMetric<MetricType>::addMemoryUsage(MemoryConsumption& mc) const { ++mc._loadMetricCount; |