diff options
author | Tor Egge <Tor.Egge@yahooinc.com> | 2023-03-06 10:29:40 +0100 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahooinc.com> | 2023-03-06 10:29:40 +0100 |
commit | fd1d0914c7b15f8c278a39f303006897223feb83 (patch) | |
tree | 24ca88ebabb5ae63ae064d881c68653888876ae9 /storage | |
parent | e22467e6500b212a611827659d79b680f1b7f805 (diff) |
Use matching duration for time_point.
Diffstat (limited to 'storage')
6 files changed, 8 insertions, 8 deletions
diff --git a/storage/src/vespa/storage/storageserver/statereporter.cpp b/storage/src/vespa/storage/storageserver/statereporter.cpp index d9e79d3b7b4..16de56fad22 100644 --- a/storage/src/vespa/storage/storageserver/statereporter.cpp +++ b/storage/src/vespa/storage/storageserver/statereporter.cpp @@ -73,7 +73,7 @@ StateReporter::getMetrics(const vespalib::string &consumer) if (periods.empty()) { return ""; // no configuration yet } - vespalib::duration interval = periods[0]; + auto interval = periods[0]; // To get unset metrics, we have to copy active metrics, clear them // and then assign the snapshot diff --git a/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp b/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp index 74d58244636..84b12d34e01 100644 --- a/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp +++ b/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp @@ -126,7 +126,7 @@ namespace { struct MetricHookWrapper : public metrics::UpdateHook { MetricUpdateHook& _hook; - MetricHookWrapper(vespalib::stringref name, MetricUpdateHook& hook, vespalib::duration period) + MetricHookWrapper(vespalib::stringref name, MetricUpdateHook& hook, vespalib::system_time::duration period) : metrics::UpdateHook(name.data(), period), // Expected to point to static name _hook(hook) { @@ -139,7 +139,7 @@ namespace { void ComponentRegisterImpl::registerUpdateHook(vespalib::stringref name, MetricUpdateHook& hook, - vespalib::duration period) + vespalib::system_time::duration period) { std::lock_guard lock(_componentLock); auto hookPtr = std::make_unique<MetricHookWrapper>(name, hook, period); diff --git a/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h b/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h index e569288ac64..43005575032 100644 --- a/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h +++ b/storage/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h @@ -73,7 +73,7 @@ public: std::vector<const StatusReporter*> getStatusReporters() override; void registerMetric(metrics::Metric&) override; - void registerUpdateHook(vespalib::stringref name, MetricUpdateHook& hook, vespalib::duration period) override; + void registerUpdateHook(vespalib::stringref name, MetricUpdateHook& hook, vespalib::system_time::duration period) override; void registerShutdownListener(ShutdownListener&); }; diff --git a/storage/src/vespa/storageframework/generic/component/component.cpp b/storage/src/vespa/storageframework/generic/component/component.cpp index 0f08503852c..c69e59b8eba 100644 --- a/storage/src/vespa/storageframework/generic/component/component.cpp +++ b/storage/src/vespa/storageframework/generic/component/component.cpp @@ -52,7 +52,7 @@ Component::registerMetric(metrics::Metric& m) } void -Component::registerMetricUpdateHook(MetricUpdateHook& hook, vespalib::duration period) +Component::registerMetricUpdateHook(MetricUpdateHook& hook, vespalib::system_time::duration period) { assert(_metricUpdateHook.first == 0); _metricUpdateHook = std::make_pair(&hook, period); diff --git a/storage/src/vespa/storageframework/generic/component/component.h b/storage/src/vespa/storageframework/generic/component/component.h index 47469cce05d..372559e133d 100644 --- a/storage/src/vespa/storageframework/generic/component/component.h +++ b/storage/src/vespa/storageframework/generic/component/component.h @@ -86,7 +86,7 @@ class Component : private ManagedComponent metrics::Metric* _metric; ThreadPool* _threadPool; MetricRegistrator* _metricReg; - std::pair<MetricUpdateHook*, vespalib::duration> _metricUpdateHook; + std::pair<MetricUpdateHook*, vespalib::system_time::duration> _metricUpdateHook; const Clock* _clock; // ManagedComponent implementation @@ -124,7 +124,7 @@ public: * update hook will only be called if there actually is a metric mananger * component registered in the application. */ - void registerMetricUpdateHook(MetricUpdateHook&, vespalib::duration period); + void registerMetricUpdateHook(MetricUpdateHook&, vespalib::system_time::duration period); /** Get the name of the component. Must be a unique name. */ [[nodiscard]] const vespalib::string& getName() const override { return _name; } diff --git a/storage/src/vespa/storageframework/generic/metric/metricregistrator.h b/storage/src/vespa/storageframework/generic/metric/metricregistrator.h index 6daca1213a8..bea43fcfb6b 100644 --- a/storage/src/vespa/storageframework/generic/metric/metricregistrator.h +++ b/storage/src/vespa/storageframework/generic/metric/metricregistrator.h @@ -24,7 +24,7 @@ struct MetricRegistrator { virtual ~MetricRegistrator() = default; virtual void registerMetric(metrics::Metric&) = 0; - virtual void registerUpdateHook(vespalib::stringref name, MetricUpdateHook& hook, vespalib::duration period) = 0; + virtual void registerUpdateHook(vespalib::stringref name, MetricUpdateHook& hook, vespalib::system_time::duration period) = 0; }; } |