diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2020-07-15 14:47:54 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2020-07-16 09:16:10 +0000 |
commit | e85a9ed49aa08f5c9ec4128045f30758979b7faf (patch) | |
tree | d4e6ddc4ee0f37983fae880e13d84e30660e09c5 /storageframework | |
parent | 65b348006103d47e69356a5c30503d30bd51c296 (diff) |
C++11 style updates and cleanup
Diffstat (limited to 'storageframework')
2 files changed, 34 insertions, 32 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp index fd16f43050a..2595514e6f4 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp @@ -19,16 +19,22 @@ ComponentRegisterImpl::ComponentRegisterImpl() _shutdownListener(nullptr) { } -ComponentRegisterImpl::~ComponentRegisterImpl() { } +ComponentRegisterImpl::~ComponentRegisterImpl() = default; void ComponentRegisterImpl::registerComponent(ManagedComponent& mc) { vespalib::LockGuard lock(_componentLock); _components.push_back(&mc); - if (_clock != 0) mc.setClock(*_clock); - if (_threadPool != 0) mc.setThreadPool(*_threadPool); - if (_metricManager != 0) mc.setMetricRegistrator(*this); + if (_clock) { + mc.setClock(*_clock); + } + if (_threadPool) { + mc.setThreadPool(*_threadPool); + } + if (_metricManager) { + mc.setMetricRegistrator(*this); + } mc.setUpgradeFlag(_upgradeFlag); } @@ -36,7 +42,7 @@ void ComponentRegisterImpl::requestShutdown(vespalib::stringref reason) { vespalib::LockGuard lock(_componentLock); - if (_shutdownListener != 0) { + if (_shutdownListener) { _shutdownListener->requestShutdown(reason); } } @@ -47,7 +53,7 @@ ComponentRegisterImpl::setMetricManager(metrics::MetricManager& mm) std::vector<ManagedComponent*> components; { vespalib::LockGuard lock(_componentLock); - assert(_metricManager == 0); + assert(_metricManager == nullptr); components = _components; _metricManager = &mm; } @@ -55,8 +61,8 @@ ComponentRegisterImpl::setMetricManager(metrics::MetricManager& mm) metrics::MetricLockGuard lock(mm.getMetricLock()); mm.registerMetric(lock, _topMetricSet); } - for (uint32_t i=0; i<components.size(); ++i) { - components[i]->setMetricRegistrator(*this); + for (auto* component : _components) { + component->setMetricRegistrator(*this); } } @@ -64,10 +70,10 @@ void ComponentRegisterImpl::setClock(Clock& c) { vespalib::LockGuard lock(_componentLock); - assert(_clock == 0); + assert(_clock == nullptr); _clock = &c; - for (uint32_t i=0; i<_components.size(); ++i) { - _components[i]->setClock(c); + for (auto* component : _components) { + component->setClock(c); } } @@ -75,10 +81,10 @@ void ComponentRegisterImpl::setThreadPool(ThreadPool& tp) { vespalib::LockGuard lock(_componentLock); - assert(_threadPool == 0); + assert(_threadPool == nullptr); _threadPool = &tp; - for (uint32_t i=0; i<_components.size(); ++i) { - _components[i]->setThreadPool(tp); + for (auto* component : _components) { + component->setThreadPool(tp); } } @@ -87,8 +93,8 @@ ComponentRegisterImpl::setUpgradeFlag(UpgradeFlags flag) { vespalib::LockGuard lock(_componentLock); _upgradeFlag = flag; - for (uint32_t i=0; i<_components.size(); ++i) { - _components[i]->setUpgradeFlag(_upgradeFlag); + for (auto* component : _components) { + component->setUpgradeFlag(_upgradeFlag); } } @@ -96,14 +102,14 @@ const StatusReporter* ComponentRegisterImpl::getStatusReporter(vespalib::stringref id) { vespalib::LockGuard lock(_componentLock); - for (uint32_t i=0; i<_components.size(); ++i) { - if (_components[i]->getStatusReporter() != 0 - && _components[i]->getStatusReporter()->getId() == id) + for (auto* component : _components) { + if ((component->getStatusReporter() != nullptr) + && (component->getStatusReporter()->getId() == id)) { - return _components[i]->getStatusReporter(); + return component->getStatusReporter(); } } - return 0; + return nullptr; } std::vector<const StatusReporter*> @@ -111,9 +117,9 @@ ComponentRegisterImpl::getStatusReporters() { std::vector<const StatusReporter*> reporters; vespalib::LockGuard lock(_componentLock); - for (uint32_t i=0; i<_components.size(); ++i) { - if (_components[i]->getStatusReporter() != 0) { - reporters.push_back(_components[i]->getStatusReporter()); + for (auto* component : _components) { + if (component->getStatusReporter() != nullptr) { + reporters.emplace_back(component->getStatusReporter()); } } return reporters; @@ -147,9 +153,9 @@ ComponentRegisterImpl::registerUpdateHook(vespalib::stringref name, SecondTime period) { vespalib::LockGuard lock(_componentLock); - metrics::UpdateHook::UP hookPtr(new MetricHookWrapper(name, hook)); + auto hookPtr = std::make_unique<MetricHookWrapper>(name, hook); _metricManager->addMetricUpdateHook(*hookPtr, period.getTime()); - _hooks.push_back(std::move(hookPtr)); + _hooks.emplace_back(std::move(hookPtr)); } metrics::MetricLockGuard @@ -162,11 +168,7 @@ void ComponentRegisterImpl::registerShutdownListener(ShutdownListener& listener) { vespalib::LockGuard lock(_componentLock); - if (_shutdownListener != 0) { - throw vespalib::IllegalStateException( - "A shutdown listener is already registered. Add functionality " - "for having multiple if we need multiple.", VESPA_STRLOC); - } + assert(_shutdownListener == nullptr); _shutdownListener = &listener; } diff --git a/storageframework/src/vespa/storageframework/generic/metric/metricregistrator.h b/storageframework/src/vespa/storageframework/generic/metric/metricregistrator.h index f8ab6699d3c..6cdbf58d555 100644 --- a/storageframework/src/vespa/storageframework/generic/metric/metricregistrator.h +++ b/storageframework/src/vespa/storageframework/generic/metric/metricregistrator.h @@ -22,7 +22,7 @@ namespace storage::framework { struct MetricUpdateHook; struct MetricRegistrator { - virtual ~MetricRegistrator() {} + virtual ~MetricRegistrator() = default; virtual void registerMetric(metrics::Metric&) = 0; virtual void registerUpdateHook(vespalib::stringref name, MetricUpdateHook& hook, SecondTime period) = 0; |