diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-24 19:15:27 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-11-24 19:16:30 +0000 |
commit | bea222ce647053c095144ce8dd26b908bd8ffbee (patch) | |
tree | 54cbf2924aac91fd62cb1d5b3599922e26bf3af6 /metrics/src | |
parent | 55e021851b5b76022c1a7d6a027dea74707ab19e (diff) |
Reduce inlining of large destructors.
Diffstat (limited to 'metrics/src')
-rw-r--r-- | metrics/src/vespa/metrics/memoryconsumption.cpp | 2 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/memoryconsumption.h | 1 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/textwriter.cpp | 5 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/textwriter.h | 17 |
4 files changed, 14 insertions, 11 deletions
diff --git a/metrics/src/vespa/metrics/memoryconsumption.cpp b/metrics/src/vespa/metrics/memoryconsumption.cpp index 883a20e3f78..d0a75fe186d 100644 --- a/metrics/src/vespa/metrics/memoryconsumption.cpp +++ b/metrics/src/vespa/metrics/memoryconsumption.cpp @@ -9,6 +9,8 @@ MemoryConsumption::MemoryConsumption() { _seenStrings.resize(1000); } +MemoryConsumption::~MemoryConsumption() { } + uint32_t MemoryConsumption::getStringMemoryUsage(const std::string& s, uint32_t& uniqueCount) { ++_totalStringCount; diff --git a/metrics/src/vespa/metrics/memoryconsumption.h b/metrics/src/vespa/metrics/memoryconsumption.h index 3cbd8ef1e36..5a8bd56e2c6 100644 --- a/metrics/src/vespa/metrics/memoryconsumption.h +++ b/metrics/src/vespa/metrics/memoryconsumption.h @@ -84,6 +84,7 @@ struct MemoryConsumption : public vespalib::Printable { std::vector<std::pair<std::string, uint32_t> > _snapShotUsage; MemoryConsumption(); + ~MemoryConsumption(); /** Get memory usage of a string that is not included when doing sizeof */ uint32_t getStringMemoryUsage(const std::string& s, uint32_t& uniqueCount); diff --git a/metrics/src/vespa/metrics/textwriter.cpp b/metrics/src/vespa/metrics/textwriter.cpp index 259b8157d57..c016ef1145b 100644 --- a/metrics/src/vespa/metrics/textwriter.cpp +++ b/metrics/src/vespa/metrics/textwriter.cpp @@ -12,8 +12,9 @@ namespace metrics { TextWriter::TextWriter(std::ostream& out, uint32_t period, const std::string& regex, bool verbose) : _period(period), _out(out), _regex(regex), _verbose(verbose) -{ -} +{ } + +TextWriter::~TextWriter() { } bool TextWriter::visitSnapshot(const MetricSnapshot& snapshot) diff --git a/metrics/src/vespa/metrics/textwriter.h b/metrics/src/vespa/metrics/textwriter.h index 88fc807fd2f..8d87a13ce51 100644 --- a/metrics/src/vespa/metrics/textwriter.h +++ b/metrics/src/vespa/metrics/textwriter.h @@ -17,15 +17,14 @@ class TextWriter : public MetricVisitor { public: TextWriter(std::ostream& out, uint32_t period, const std::string& regex, bool verbose); - - virtual bool visitSnapshot(const MetricSnapshot&); - virtual void doneVisitingSnapshot(const MetricSnapshot&); - virtual bool visitMetricSet(const MetricSet& set, bool); - virtual void doneVisitingMetricSet(const MetricSet&); - virtual bool visitCountMetric(const AbstractCountMetric&, - bool autoGenerated); - virtual bool visitValueMetric(const AbstractValueMetric&, - bool autoGenerated); + ~TextWriter(); + + bool visitSnapshot(const MetricSnapshot&) override; + void doneVisitingSnapshot(const MetricSnapshot&) override; + bool visitMetricSet(const MetricSet& set, bool) override; + void doneVisitingMetricSet(const MetricSet&) override; + bool visitCountMetric(const AbstractCountMetric&, bool autoGenerated) override; + bool visitValueMetric(const AbstractValueMetric&, bool autoGenerated) override; private: bool writeCommon(const Metric& m); |