diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-23 13:37:37 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-23 13:37:37 +0000 |
commit | 46c8a967b4b42b43dbae97525c8e62ce05b5099a (patch) | |
tree | e0ad8ec93c1e72b32ccb4d909f5ce01576b5942a /metrics/src | |
parent | ec4240010b82eabc1fa0efad47082541da9d246a (diff) |
time(0) to chrono::steady_clock.
Diffstat (limited to 'metrics/src')
-rw-r--r-- | metrics/src/vespa/metrics/metricmanager.cpp | 7 | ||||
-rw-r--r-- | metrics/src/vespa/metrics/metricmanager.h | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/metrics/src/vespa/metrics/metricmanager.cpp b/metrics/src/vespa/metrics/metricmanager.cpp index 2308102506b..4edcedf7dd4 100644 --- a/metrics/src/vespa/metrics/metricmanager.cpp +++ b/metrics/src/vespa/metrics/metricmanager.cpp @@ -27,6 +27,11 @@ typedef MetricsmanagerConfig Config; MetricManager::ConsumerSpec::ConsumerSpec() = default; MetricManager::ConsumerSpec::~ConsumerSpec() = default; +time_t +MetricManager::Timer::getTime() const { + return std::chrono::duration_cast<std::chrono::seconds>(std::chrono::steady_clock::now().time_since_epoch()).count(); +} + void MetricManager::assertMetricLockLocked(const MetricLockGuard& g) const { if (!g.monitors(_waiter)) { @@ -327,7 +332,7 @@ namespace { { LOG(spam, "Adding metrics for consumer %s", c.name.c_str()); } - ConsumerMetricBuilder::~ConsumerMetricBuilder() { } + ConsumerMetricBuilder::~ConsumerMetricBuilder() = default; } diff --git a/metrics/src/vespa/metrics/metricmanager.h b/metrics/src/vespa/metrics/metricmanager.h index 3b8de5927ec..f2b2926873f 100644 --- a/metrics/src/vespa/metrics/metricmanager.h +++ b/metrics/src/vespa/metrics/metricmanager.h @@ -70,7 +70,7 @@ public: struct Timer { virtual ~Timer() {} - virtual time_t getTime() const { return time(0); } + virtual time_t getTime() const; virtual time_t getTimeInMilliSecs() const { return getTime() * 1000; } }; @@ -85,7 +85,7 @@ public: ConsumerSpec(ConsumerSpec &&) = default; ConsumerSpec & operator= (ConsumerSpec &&) = default; ConsumerSpec(); - ~ConsumerSpec(); + ~ConsumerSpec() override; bool contains(const Metric& m) const { return (includedMetrics.find(m.getPath()) != includedMetrics.end()); @@ -126,8 +126,8 @@ private: LongAverageMetric _sleepTimes; public: - MetricManager(std::unique_ptr<Timer> timer = std::unique_ptr<Timer>(new Timer)); - ~MetricManager(); + MetricManager(std::unique_ptr<Timer> timer = std::make_unique<Timer>()); + ~MetricManager() override; void stop(); |