From 7aba0842e9f987cead29416ba797aebea241b9f6 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Thu, 3 Mar 2022 14:56:56 +0000 Subject: Inline small getters --- config/src/vespa/config/common/configupdate.cpp | 3 --- config/src/vespa/config/common/configupdate.h | 6 +++--- .../config/subscription/configsubscription.cpp | 24 ---------------------- .../vespa/config/subscription/configsubscription.h | 18 ++++++++-------- .../config/subscription/configsubscriptionset.cpp | 12 ----------- .../config/subscription/configsubscriptionset.h | 8 ++++++-- 6 files changed, 18 insertions(+), 53 deletions(-) diff --git a/config/src/vespa/config/common/configupdate.cpp b/config/src/vespa/config/common/configupdate.cpp index 55f12775a46..b18186363e6 100644 --- a/config/src/vespa/config/common/configupdate.cpp +++ b/config/src/vespa/config/common/configupdate.cpp @@ -10,8 +10,5 @@ ConfigUpdate::ConfigUpdate(ConfigValue value, bool changed, int64_t generation) { } ConfigUpdate::~ConfigUpdate() = default; -const ConfigValue & ConfigUpdate::getValue() const { return _value; } -bool ConfigUpdate::hasChanged() const { return _hasChanged; } -int64_t ConfigUpdate::getGeneration() const { return _generation; } } // namespace config diff --git a/config/src/vespa/config/common/configupdate.h b/config/src/vespa/config/common/configupdate.h index 35d641615a0..adafbbd3c0f 100644 --- a/config/src/vespa/config/common/configupdate.h +++ b/config/src/vespa/config/common/configupdate.h @@ -16,9 +16,9 @@ public: ConfigUpdate(const ConfigUpdate &) = delete; ConfigUpdate & operator = (const ConfigUpdate &) = delete; ~ConfigUpdate(); - const ConfigValue & getValue() const; - bool hasChanged() const; - int64_t getGeneration() const; + const ConfigValue & getValue() const { return _value; } + bool hasChanged() const { return _hasChanged; } + int64_t getGeneration() const { return _generation; } void merge(const ConfigUpdate & b) { _hasChanged = _hasChanged || b.hasChanged(); } private: ConfigValue _value; diff --git a/config/src/vespa/config/subscription/configsubscription.cpp b/config/src/vespa/config/subscription/configsubscription.cpp index e0528f0246e..f145c26d551 100644 --- a/config/src/vespa/config/subscription/configsubscription.cpp +++ b/config/src/vespa/config/subscription/configsubscription.cpp @@ -63,12 +63,6 @@ ConfigSubscription::getGeneration() const return _next->getGeneration(); } -const ConfigKey & -ConfigSubscription::getKey() const -{ - return _key; -} - void ConfigSubscription::close() { @@ -79,24 +73,6 @@ ConfigSubscription::close() } } -void -ConfigSubscription::reset() -{ - _isChanged = false; -} - -bool -ConfigSubscription::isChanged() const -{ - return _isChanged; -} - -int64_t -ConfigSubscription::getLastGenerationChanged() const -{ - return _lastGenerationChanged; -} - void ConfigSubscription::flip() { diff --git a/config/src/vespa/config/subscription/configsubscription.h b/config/src/vespa/config/subscription/configsubscription.h index 5938a085ec2..ffd151eb82c 100644 --- a/config/src/vespa/config/subscription/configsubscription.h +++ b/config/src/vespa/config/subscription/configsubscription.h @@ -39,22 +39,22 @@ public: * * @return true if changed, false if not. */ - bool isChanged() const; + bool isChanged() const { return _isChanged; } /** * Returns the last generation that actually changed the config. */ - int64_t getLastGenerationChanged() const; + int64_t getLastGenerationChanged() const { return _lastGenerationChanged; } /// Used by ConfigSubscriptionSet SubscriptionId getSubscriptionId() const { return _id; } - const ConfigKey & getKey() const; + const ConfigKey & getKey() const { return _key; } bool nextUpdate(int64_t generation, vespalib::steady_time deadline); int64_t getGeneration() const; bool hasChanged() const; bool hasGenerationChanged() const; void flip(); - void reset(); + void reset() { _isChanged = false; } void close(); // Used by ConfigManager @@ -65,11 +65,11 @@ private: const ConfigKey _key; std::unique_ptr _source; std::shared_ptr _holder; - std::unique_ptr _next; - std::unique_ptr _current; - bool _isChanged; - int64_t _lastGenerationChanged; - std::atomic _closed; + std::unique_ptr _next; + std::unique_ptr _current; + bool _isChanged; + int64_t _lastGenerationChanged; + std::atomic _closed; }; typedef std::vector SubscriptionList; diff --git a/config/src/vespa/config/subscription/configsubscriptionset.cpp b/config/src/vespa/config/subscription/configsubscriptionset.cpp index df913ed961c..1d5db778dda 100644 --- a/config/src/vespa/config/subscription/configsubscriptionset.cpp +++ b/config/src/vespa/config/subscription/configsubscriptionset.cpp @@ -116,12 +116,6 @@ ConfigSubscriptionSet::close() } } -bool -ConfigSubscriptionSet::isClosed() const -{ - return (_state.load(std::memory_order_relaxed) == CLOSED); -} - std::shared_ptr ConfigSubscriptionSet::subscribe(const ConfigKey & key, duration timeout) { @@ -135,10 +129,4 @@ ConfigSubscriptionSet::subscribe(const ConfigKey & key, duration timeout) return s; } -int64_t -ConfigSubscriptionSet::getGeneration() const -{ - return _currentGeneration; -} - } // namespace config diff --git a/config/src/vespa/config/subscription/configsubscriptionset.h b/config/src/vespa/config/subscription/configsubscriptionset.h index 9cee3894aa9..1d75480d602 100644 --- a/config/src/vespa/config/subscription/configsubscriptionset.h +++ b/config/src/vespa/config/subscription/configsubscriptionset.h @@ -38,7 +38,9 @@ public: * * @return generation number */ - int64_t getGeneration() const; + int64_t getGeneration() const { + return _currentGeneration; + } /** * Closes the set, which will interrupt acquireSnapshot and unsubscribe all @@ -49,7 +51,9 @@ public: /** * Checks if this subscription set is closed. */ - bool isClosed() const; + bool isClosed() const { + return (_state.load(std::memory_order_relaxed) == CLOSED); + } // Helpers for doing the subscription std::shared_ptr subscribe(const ConfigKey & key, vespalib::duration timeout); -- cgit v1.2.3