diff options
author | Henning Baldersheim <balder@oath.com> | 2018-08-11 00:35:31 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-08-11 00:35:31 +0200 |
commit | e198573919f269bf62bb7ff22c0fb5797375ef9c (patch) | |
tree | 33b1c2b551290c70d6647c6c5b313758e5fe950c /metrics | |
parent | 9f1d806d415b458b2139ce0cbf6b03a3ae979539 (diff) |
Pass stringref by value
Diffstat (limited to 'metrics')
-rw-r--r-- | metrics/src/vespa/metrics/countmetric.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/countmetricvalues.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/countmetricvalues.hpp | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metric.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metricset.cpp | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metricset.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metricvalueset.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/summetric.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/summetric.hpp | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/valuemetric.h | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/valuemetric.hpp | 4 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/valuemetricvalues.h | 6 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/valuemetricvalues.hpp | 6 |
13 files changed, 28 insertions, 28 deletions
diff --git a/metrics/src/vespa/metrics/countmetric.h b/metrics/src/vespa/metrics/countmetric.h index 4de1674c5ed..dd4c9e6fc92 100644 --- a/metrics/src/vespa/metrics/countmetric.h +++ b/metrics/src/vespa/metrics/countmetric.h @@ -111,11 +111,11 @@ public: const std::string& indent, uint64_t secondsPassed) const override; // Only one metric in valuemetric, so return it on any id. - int64_t getLongValue(const stringref & id) const override { + int64_t getLongValue(stringref id) const override { (void) id; return static_cast<int64_t>(getValue()); } - double getDoubleValue(const stringref & id) const override { + double getDoubleValue(stringref id) const override { (void) id; return static_cast<double>(getValue()); } diff --git a/metrics/src/vespa/metrics/countmetricvalues.h b/metrics/src/vespa/metrics/countmetricvalues.h index 226d1a53ddb..cef2a0ee123 100644 --- a/metrics/src/vespa/metrics/countmetricvalues.h +++ b/metrics/src/vespa/metrics/countmetricvalues.h @@ -37,8 +37,8 @@ struct CountMetricValues : public MetricValueClass { CountMetricValues() : _value(0) {} std::string toString() const; - double getDoubleValue(const stringref &) const override; - uint64_t getLongValue(const stringref &) const override; + double getDoubleValue(stringref ) const override; + uint64_t getLongValue(stringref ) const override; void output(const std::string&, std::ostream& out) const override; void output(const std::string&, vespalib::JsonStream& stream) const override; bool inUse() const { return (_value != 0); } diff --git a/metrics/src/vespa/metrics/countmetricvalues.hpp b/metrics/src/vespa/metrics/countmetricvalues.hpp index 15732a7c1d5..66c0fbc6c46 100644 --- a/metrics/src/vespa/metrics/countmetricvalues.hpp +++ b/metrics/src/vespa/metrics/countmetricvalues.hpp @@ -15,12 +15,12 @@ CountMetricValues<T>::toString() const { } template <typename T> double -CountMetricValues<T>::getDoubleValue(const stringref &) const { +CountMetricValues<T>::getDoubleValue(stringref ) const { return static_cast<double>(_value); } template <typename T> uint64_t -CountMetricValues<T>::getLongValue(const stringref &) const { +CountMetricValues<T>::getLongValue(stringref ) const { return static_cast<uint64_t>(_value); } template <typename T> diff --git a/metrics/src/vespa/metrics/metric.h b/metrics/src/vespa/metrics/metric.h index 1b97dcb7d27..5b617e68a7f 100644 --- a/metrics/src/vespa/metrics/metric.h +++ b/metrics/src/vespa/metrics/metric.h @@ -180,8 +180,8 @@ public: * @param id The part of the metric to extract. For instance, an average * metric have average, */ - virtual int64_t getLongValue(const stringref & id) const = 0; - virtual double getDoubleValue(const stringref & id) const = 0; + virtual int64_t getLongValue(stringref id) const = 0; + virtual double getDoubleValue(stringref id) const = 0; /** * When snapshotting we need to be able to add data from one set of metrics diff --git a/metrics/src/vespa/metrics/metricset.cpp b/metrics/src/vespa/metrics/metricset.cpp index 6ac27ba38c9..696062013e8 100644 --- a/metrics/src/vespa/metrics/metricset.cpp +++ b/metrics/src/vespa/metrics/metricset.cpp @@ -76,11 +76,11 @@ MetricSet::getMetricInternal(const String& name) const return 0; } -int64_t MetricSet::getLongValue(const stringref &) const { +int64_t MetricSet::getLongValue(stringref ) const { assert(false); return 0; } -double MetricSet::getDoubleValue(const stringref &) const { +double MetricSet::getDoubleValue(stringref ) const { assert(false); return 0; } diff --git a/metrics/src/vespa/metrics/metricset.h b/metrics/src/vespa/metrics/metricset.h index e6f7cfc0deb..9671aaffbfc 100644 --- a/metrics/src/vespa/metrics/metricset.h +++ b/metrics/src/vespa/metrics/metricset.h @@ -63,8 +63,8 @@ public: void print(std::ostream&, bool verbose, const std::string& indent, uint64_t secondsPassed) const override; // These should never be called on metrics set. - int64_t getLongValue(const stringref & id) const override; - double getDoubleValue(const stringref & id) const override; + int64_t getLongValue(stringref id) const override; + double getDoubleValue(stringref id) const override; const Metric* getMetric(const String& name) const; Metric* getMetric(const String& name) { diff --git a/metrics/src/vespa/metrics/metricvalueset.h b/metrics/src/vespa/metrics/metricvalueset.h index 41498b6503c..2463990378e 100644 --- a/metrics/src/vespa/metrics/metricvalueset.h +++ b/metrics/src/vespa/metrics/metricvalueset.h @@ -39,8 +39,8 @@ struct MetricValueClass { using stringref = vespalib::stringref; virtual ~MetricValueClass() {} - virtual double getDoubleValue(const stringref & id) const = 0; - virtual uint64_t getLongValue(const stringref & id) const = 0; + virtual double getDoubleValue(stringref id) const = 0; + virtual uint64_t getLongValue(stringref id) const = 0; virtual void output(const std::string& id, std::ostream&) const = 0; virtual void output(const std::string& id, vespalib::JsonStream&) const = 0; std::string toString(const std::string& id); diff --git a/metrics/src/vespa/metrics/summetric.h b/metrics/src/vespa/metrics/summetric.h index 784ae1f20e7..3dc58d32bef 100644 --- a/metrics/src/vespa/metrics/summetric.h +++ b/metrics/src/vespa/metrics/summetric.h @@ -61,8 +61,8 @@ public: bool logEvent(const String& fullName) const override; void print(std::ostream&, bool verbose, const std::string& indent, uint64_t secondsPassed) const override; - int64_t getLongValue(const stringref & id) const override; - double getDoubleValue(const stringref & id) const override; + int64_t getLongValue(stringref id) const override; + double getDoubleValue(stringref id) const override; void reset() override {} bool visit(MetricVisitor& visitor, bool tagAsAutoGenerated = false) const override; bool used() const override; diff --git a/metrics/src/vespa/metrics/summetric.hpp b/metrics/src/vespa/metrics/summetric.hpp index 761b369fb57..8e558eb94ee 100644 --- a/metrics/src/vespa/metrics/summetric.hpp +++ b/metrics/src/vespa/metrics/summetric.hpp @@ -234,7 +234,7 @@ SumMetric<AddendMetric>::generateSum() const template<typename AddendMetric> int64_t -SumMetric<AddendMetric>::getLongValue(const stringref & id) const +SumMetric<AddendMetric>::getLongValue(stringref id) const { std::pair<std::vector<Metric::UP>, Metric::UP> sum(generateSum()); if (sum.second.get() == 0) return 0; @@ -243,7 +243,7 @@ SumMetric<AddendMetric>::getLongValue(const stringref & id) const template<typename AddendMetric> double -SumMetric<AddendMetric>::getDoubleValue(const stringref & id) const +SumMetric<AddendMetric>::getDoubleValue(stringref id) const { std::pair<std::vector<Metric::UP>, Metric::UP> sum(generateSum()); if (sum.second.get() == 0) return 0.0; diff --git a/metrics/src/vespa/metrics/valuemetric.h b/metrics/src/vespa/metrics/valuemetric.h index 0c40a0fa5ea..57baa36c26a 100644 --- a/metrics/src/vespa/metrics/valuemetric.h +++ b/metrics/src/vespa/metrics/valuemetric.h @@ -147,8 +147,8 @@ public: void print(std::ostream&, bool verbose, const std::string& indent, uint64_t secondsPassed) const override; - int64_t getLongValue(const stringref & id) const override; - double getDoubleValue(const stringref & id) const override; + int64_t getLongValue(stringref id) const override; + double getDoubleValue(stringref id) const override; bool inUse(const MetricValueClass& v) const override { const Values& values(static_cast<const Values&>(v)); diff --git a/metrics/src/vespa/metrics/valuemetric.hpp b/metrics/src/vespa/metrics/valuemetric.hpp index f8b4d1626ab..60ed219edec 100644 --- a/metrics/src/vespa/metrics/valuemetric.hpp +++ b/metrics/src/vespa/metrics/valuemetric.hpp @@ -226,7 +226,7 @@ ValueMetric<AvgVal, TotVal, SumOnAdd>::print( template<typename AvgVal, typename TotVal, bool SumOnAdd> int64_t -ValueMetric<AvgVal, TotVal, SumOnAdd>::getLongValue(const stringref & id) const +ValueMetric<AvgVal, TotVal, SumOnAdd>::getLongValue(stringref id) const { Values values(_values.getValues()); if (id == "last" || (SumOnAdd && id == "value")) @@ -245,7 +245,7 @@ ValueMetric<AvgVal, TotVal, SumOnAdd>::getLongValue(const stringref & id) const template<typename AvgVal, typename TotVal, bool SumOnAdd> double -ValueMetric<AvgVal, TotVal, SumOnAdd>::getDoubleValue(const stringref & id) const +ValueMetric<AvgVal, TotVal, SumOnAdd>::getDoubleValue(stringref id) const { Values values(_values.getValues()); if (id == "last" || (SumOnAdd && id == "value")) diff --git a/metrics/src/vespa/metrics/valuemetricvalues.h b/metrics/src/vespa/metrics/valuemetricvalues.h index 391b9c9d588..567f0d0ae0f 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.h +++ b/metrics/src/vespa/metrics/valuemetricvalues.h @@ -37,9 +37,9 @@ struct ValueMetricValues : MetricValueClass { void relaxedLoadFrom(const AtomicImpl& source) noexcept; template<typename T> - T getValue(const stringref & id) const; - double getDoubleValue(const stringref & id) const override; - uint64_t getLongValue(const stringref & id) const override; + T getValue(stringref id) const; + double getDoubleValue(stringref id) const override; + uint64_t getLongValue(stringref id) const override; void output(const std::string& id, std::ostream& out) const override; void output(const std::string& id, vespalib::JsonStream& stream) const override; template<typename A, typename T> diff --git a/metrics/src/vespa/metrics/valuemetricvalues.hpp b/metrics/src/vespa/metrics/valuemetricvalues.hpp index 9f63898d4f3..b33e636b120 100644 --- a/metrics/src/vespa/metrics/valuemetricvalues.hpp +++ b/metrics/src/vespa/metrics/valuemetricvalues.hpp @@ -48,7 +48,7 @@ void ValueMetricValues<AvgVal, TotVal>::relaxedLoadFrom(const AtomicImpl& source template<typename AvgVal, typename TotVal> template<typename T> -T ValueMetricValues<AvgVal, TotVal>::getValue(const stringref & id) const { +T ValueMetricValues<AvgVal, TotVal>::getValue(stringref id) const { if (id == "last") return static_cast<T>(_last); if (id == "count") return static_cast<T>(_count); if (id == "total") return static_cast<T>(_total); @@ -58,11 +58,11 @@ T ValueMetricValues<AvgVal, TotVal>::getValue(const stringref & id) const { } template<typename AvgVal, typename TotVal> -double ValueMetricValues<AvgVal, TotVal>::getDoubleValue(const stringref & id) const { +double ValueMetricValues<AvgVal, TotVal>::getDoubleValue(stringref id) const { return getValue<double>(id); } template<typename AvgVal, typename TotVal> -uint64_t ValueMetricValues<AvgVal, TotVal>::getLongValue(const stringref & id) const { +uint64_t ValueMetricValues<AvgVal, TotVal>::getLongValue(stringref id) const { return getValue<uint64_t>(id); } template<typename AvgVal, typename TotVal> |