diff options
author | Henning Baldersheim <balder@oath.com> | 2018-03-23 14:46:15 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-04-03 18:33:28 +0200 |
commit | 5504226d0fdf9fbde745d471bf121284f305c01b (patch) | |
tree | d15a084bdce7503fcd6c34771063c423379a765c /storageframework | |
parent | 063140bbbd80e7329aa528bc3e467fb5a5e6f777 (diff) |
Remove unused code
Diffstat (limited to 'storageframework')
5 files changed, 4 insertions, 40 deletions
diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp index e1623503f08..a5611451ee8 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp +++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.cpp @@ -13,7 +13,6 @@ ComponentRegisterImpl::ComponentRegisterImpl() _topMetricSet("vds", "", ""), _hooks(), _metricManager(nullptr), - _memoryManager(nullptr), _clock(nullptr), _threadPool(nullptr), _upgradeFlag(NO_UPGRADE_SPECIAL_HANDLING_ACTIVE), @@ -27,7 +26,6 @@ ComponentRegisterImpl::registerComponent(ManagedComponent& mc) { vespalib::LockGuard lock(_componentLock); _components.push_back(&mc); - if (_memoryManager != 0) mc.setMemoryManager(*_memoryManager); if (_clock != 0) mc.setClock(*_clock); if (_threadPool != 0) mc.setThreadPool(*_threadPool); if (_metricManager != 0) mc.setMetricRegistrator(*this); diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h index 3e3dd08e1df..b5f79313dfb 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h +++ b/storageframework/src/vespa/storageframework/defaultimplementation/component/componentregisterimpl.h @@ -49,7 +49,6 @@ class ComponentRegisterImpl : public virtual ComponentRegister, metrics::MetricSet _topMetricSet; std::vector<std::unique_ptr<metrics::UpdateHook>> _hooks; metrics::MetricManager* _metricManager; - MemoryManagerInterface* _memoryManager; Clock* _clock; ThreadPool* _threadPool; UpgradeFlags _upgradeFlag; @@ -62,10 +61,7 @@ public: ~ComponentRegisterImpl(); bool hasMetricManager() const { return (_metricManager != 0); } - metrics::MetricManager& getMetricManager() { - assert(_metricManager != 0); - return *_metricManager; - } + metrics::MetricManager& getMetricManager() { return *_metricManager; } void registerComponent(ManagedComponent&) override; void requestShutdown(vespalib::stringref reason) override; @@ -79,9 +75,7 @@ public: std::vector<const StatusReporter*> getStatusReporters() override; void registerMetric(metrics::Metric&) override; - void registerUpdateHook(vespalib::stringref name, - MetricUpdateHook& hook, - SecondTime period) override; + void registerUpdateHook(vespalib::stringref name, MetricUpdateHook& hook, SecondTime period) override; vespalib::MonitorGuard getMetricManagerLock() override; void registerShutdownListener(ShutdownListener&); diff --git a/storageframework/src/vespa/storageframework/generic/component/component.cpp b/storageframework/src/vespa/storageframework/generic/component/component.cpp index 869df4296ef..b0569bdee41 100644 --- a/storageframework/src/vespa/storageframework/generic/component/component.cpp +++ b/storageframework/src/vespa/storageframework/generic/component/component.cpp @@ -26,7 +26,6 @@ Component::Component(ComponentRegister& cr, vespalib::stringref name) _metric(0), _threadPool(0), _metricReg(0), - _memoryManager(0), _clock(0), _listener(0) { @@ -97,21 +96,7 @@ Component::getThreadPool() const return *_threadPool; } -MemoryManagerInterface& -Component::getMemoryManager() const -{ - assert(_memoryManager != 0); - return *_memoryManager; -} - -Clock& -Component::getClock() const -{ - assert(_clock != 0); - return *_clock; -} - - // Helper functions for components wanting to start a single thread. +// Helper functions for components wanting to start a single thread. Thread::UP Component::startThread(Runnable& runnable, MilliSecTime waitTime, MilliSecTime maxProcessTime, int ticksBeforeWait) { diff --git a/storageframework/src/vespa/storageframework/generic/component/component.h b/storageframework/src/vespa/storageframework/generic/component/component.h index b16e31290b8..d8f303ca2d9 100644 --- a/storageframework/src/vespa/storageframework/generic/component/component.h +++ b/storageframework/src/vespa/storageframework/generic/component/component.h @@ -94,7 +94,6 @@ class Component : private ManagedComponent ThreadPool* _threadPool; MetricRegistrator* _metricReg; std::pair<MetricUpdateHook*, SecondTime> _metricUpdateHook; - MemoryManagerInterface* _memoryManager; Clock* _clock; ComponentStateListener* _listener; std::atomic<UpgradeFlags> _upgradeFlag; @@ -108,7 +107,6 @@ class Component : private ManagedComponent std::pair<MetricUpdateHook*, SecondTime> getMetricUpdateHook() override { return _metricUpdateHook; } const StatusReporter* getStatusReporter() override { return _status; } void setMetricRegistrator(MetricRegistrator& mr) override; - void setMemoryManager(MemoryManagerInterface& mm) override { _memoryManager = &mm; } void setClock(Clock& c) override { _clock = &c; } void setThreadPool(ThreadPool& tp) override { _threadPool = &tp; } void setUpgradeFlag(UpgradeFlags flag) override { @@ -174,21 +172,12 @@ public: ThreadPool& getThreadPool() const; /** - * Get the memory manager used in this application if any. This function - * will fail before the application has registered a memory manager - * implementation. Applications using memory management are encouraged to - * register a memory manager before creating components to avoid needing - * components to delay using it. - */ - MemoryManagerInterface& getMemoryManager() const; - - /** * Get the clock used in this application. This function will fail before * the application has registered a clock implementation. Applications are * encourated to register a clock implementation before adding components to * avoid needing components to delay using it. */ - Clock& getClock() const; + Clock& getClock() const { return *_clock; } /** * Helper functions for components wanting to start a single thread. diff --git a/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h b/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h index 18697238e3d..a3e6a7bfb47 100644 --- a/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h +++ b/storageframework/src/vespa/storageframework/generic/component/managedcomponent.h @@ -22,7 +22,6 @@ namespace metrics { namespace storage::framework { class StatusReporter; -class MemoryManagerInterface; class MetricRegistrator; class MetricUpdateHook; class ThreadPool; @@ -65,7 +64,6 @@ struct ManagedComponent { virtual const StatusReporter* getStatusReporter() = 0; virtual void setMetricRegistrator(MetricRegistrator&) = 0; - virtual void setMemoryManager(MemoryManagerInterface&) = 0; virtual void setClock(Clock&) = 0; virtual void setThreadPool(ThreadPool&) = 0; virtual void setUpgradeFlag(UpgradeFlags flag) = 0; |