diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-05 02:32:06 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-23 02:03:47 +0200 |
commit | b57308e4a134fb6139d2cb52a031d3e7185f16cf (patch) | |
tree | 7c31d445e2f76bb737ef90ce29e0e7e6738d6eb1 /messagebus | |
parent | 40b8ba5a3f34028d208d4e0dc1b46940d6fe5a47 (diff) |
Use override
Diffstat (limited to 'messagebus')
17 files changed, 27 insertions, 75 deletions
diff --git a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h index d552c3c48e9..ff49f15b416 100644 --- a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h +++ b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h @@ -164,13 +164,8 @@ public: */ uint32_t getMaxPendingCount() const { return (uint32_t)_windowSize; } - // Implements IThrottlePolicy. bool canSend(const Message &msg, uint32_t pendingCount) override; - - // Implements IThrottlePolicy. void processMessage(Message &msg) override; - - // Implements IThrottlePolicy. void processReply(Reply &reply) override; }; diff --git a/messagebus/src/vespa/messagebus/emptyreply.h b/messagebus/src/vespa/messagebus/emptyreply.h index f2d431c8ada..db8beb33b9b 100644 --- a/messagebus/src/vespa/messagebus/emptyreply.h +++ b/messagebus/src/vespa/messagebus/emptyreply.h @@ -26,24 +26,23 @@ public: * * @return "" */ - virtual const string & getProtocol() const override; + const string & getProtocol() const override; /** * This method returns the message type id reserved for empty replies: 0 * * @return 0 */ - virtual uint32_t getType() const override; + uint32_t getType() const override; /** * Encodes this reply into an empty blob. * * @return empty blob */ - virtual Blob encode() const; + Blob encode() const; uint8_t priority() const override { return 8; } }; } // namespace mbus - diff --git a/messagebus/src/vespa/messagebus/intermediatesession.h b/messagebus/src/vespa/messagebus/intermediatesession.h index 064b223707f..b4832d5069a 100644 --- a/messagebus/src/vespa/messagebus/intermediatesession.h +++ b/messagebus/src/vespa/messagebus/intermediatesession.h @@ -87,10 +87,7 @@ public: */ const string getConnectionSpec() const; - // Implements IMessageHandler. void handleMessage(Message::UP message) override; - - // Implements IReplyHandler. void handleReply(Reply::UP reply) override; }; diff --git a/messagebus/src/vespa/messagebus/message.h b/messagebus/src/vespa/messagebus/message.h index 6fc72af0055..cea0aaa91fb 100644 --- a/messagebus/src/vespa/messagebus/message.h +++ b/messagebus/src/vespa/messagebus/message.h @@ -35,10 +35,9 @@ public: * will log an error and generate an auto-reply to avoid having the sender * wait indefinetly for a reply. */ - virtual ~Message(); + ~Message(); - // Overrides Routable. - virtual void swapState(Routable &rhs) override; + void swapState(Routable &rhs) override; /** * Returns the timestamp for when this message was last seen by message @@ -139,7 +138,7 @@ public: * * @return false */ - virtual bool isReply() const override { return false; } + bool isReply() const override { return false; } /** * Returns whether or not this message contains a sequence identifier that diff --git a/messagebus/src/vespa/messagebus/messenger.h b/messagebus/src/vespa/messagebus/messenger.h index fe76513eef9..70207029e19 100644 --- a/messagebus/src/vespa/messagebus/messenger.h +++ b/messagebus/src/vespa/messagebus/messenger.h @@ -47,7 +47,6 @@ private: bool _closed; protected: - // Implements FastOS_Runnable. void Run(FastOS_ThreadInterface *thread, void *arg) override; public: diff --git a/messagebus/src/vespa/messagebus/reply.h b/messagebus/src/vespa/messagebus/reply.h index 8bc4f5921e0..f352d442931 100644 --- a/messagebus/src/vespa/messagebus/reply.h +++ b/messagebus/src/vespa/messagebus/reply.h @@ -39,17 +39,10 @@ public: * will log an error and generate an auto-reply to avoid having the sender * wait indefinetly for a reply. */ - virtual ~Reply(); + ~Reply(); - // Inherit doc from Routable. - virtual void swapState(Routable &rhs) override; - - /** - * Inherited from Routable. Classifies this object as 'a reply'. - * - * @return true - */ - virtual bool isReply() const override; + void swapState(Routable &rhs) override; + bool isReply() const override; /** * Add an Error to this Reply diff --git a/messagebus/src/vespa/messagebus/routablequeue.h b/messagebus/src/vespa/messagebus/routablequeue.h index ea2b14b64f6..acb99d7269a 100644 --- a/messagebus/src/vespa/messagebus/routablequeue.h +++ b/messagebus/src/vespa/messagebus/routablequeue.h @@ -76,14 +76,14 @@ public: * * @param msg the Message to handle **/ - virtual void handleMessage(Message::UP msg) override; + void handleMessage(Message::UP msg) override; /** * Handle a Reply by enqueuing it. * * @param reply the Reply to handle **/ - virtual void handleReply(Reply::UP reply) override; + void handleReply(Reply::UP reply) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/sendproxy.h b/messagebus/src/vespa/messagebus/sendproxy.h index ca0c3f39661..e0212c4c222 100644 --- a/messagebus/src/vespa/messagebus/sendproxy.h +++ b/messagebus/src/vespa/messagebus/sendproxy.h @@ -34,13 +34,8 @@ public: */ SendProxy(MessageBus &mbus, INetwork &net, Resender *resender); - // Implements IDiscardHandler. void handleDiscard(Context ctx) override; - - // Implements IMessageHandler. void handleMessage(Message::UP msg) override; - - // Implements IReplyHandler. void handleReply(Reply::UP reply) override; }; diff --git a/messagebus/src/vespa/messagebus/staticthrottlepolicy.h b/messagebus/src/vespa/messagebus/staticthrottlepolicy.h index b7cc6bdfe99..586451ea83a 100644 --- a/messagebus/src/vespa/messagebus/staticthrottlepolicy.h +++ b/messagebus/src/vespa/messagebus/staticthrottlepolicy.h @@ -70,13 +70,8 @@ public: */ uint64_t getPendingSize() const; - // Implements IThrottlePolicy. bool canSend(const Message &msg, uint32_t pendingCount) override; - - // Implements IThrottlePolicy. void processMessage(Message &msg) override; - - // Implements IThrottlePolicy. void processReply(Reply &reply) override; }; diff --git a/messagebus/src/vespa/messagebus/systemtimer.h b/messagebus/src/vespa/messagebus/systemtimer.h index 14156253067..4a83add0732 100644 --- a/messagebus/src/vespa/messagebus/systemtimer.h +++ b/messagebus/src/vespa/messagebus/systemtimer.h @@ -12,7 +12,6 @@ namespace mbus { */ class SystemTimer : public ITimer { public: - // Implements ITimer. uint64_t getMilliTime() const override; }; diff --git a/messagebus/src/vespa/messagebus/testlib/custompolicy.h b/messagebus/src/vespa/messagebus/testlib/custompolicy.h index 953f4f3c92e..4fec4efe7c2 100644 --- a/messagebus/src/vespa/messagebus/testlib/custompolicy.h +++ b/messagebus/src/vespa/messagebus/testlib/custompolicy.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/messagebus/routing/iroutingpolicy.h> #include "simpleprotocol.h" +#include <vespa/messagebus/routing/iroutingpolicy.h> namespace mbus { @@ -17,8 +17,8 @@ public: const std::vector<uint32_t> consumableErrors, const std::vector<Route> &routes); - virtual void select(RoutingContext &context) override; - virtual void merge(RoutingContext &context) override; + void select(RoutingContext &context) override; + void merge(RoutingContext &context) override; }; class CustomPolicyFactory : public SimpleProtocol::IPolicyFactory { @@ -37,4 +37,3 @@ public: }; } // namespace mbus - diff --git a/messagebus/src/vespa/messagebus/testlib/receptor.h b/messagebus/src/vespa/messagebus/testlib/receptor.h index c64e60eb6de..2e9a424b481 100644 --- a/messagebus/src/vespa/messagebus/testlib/receptor.h +++ b/messagebus/src/vespa/messagebus/testlib/receptor.h @@ -20,11 +20,10 @@ private: Receptor &operator=(const Receptor &); public: Receptor(); - virtual void handleMessage(Message::UP msg) override; - virtual void handleReply(Reply::UP reply) override; + void handleMessage(Message::UP msg) override; + void handleReply(Reply::UP reply) override; Message::UP getMessage(double maxWait = 120.0); Reply::UP getReply(double maxWait = 120.0); }; } // namespace mbus - diff --git a/messagebus/src/vespa/messagebus/testlib/simplemessage.h b/messagebus/src/vespa/messagebus/testlib/simplemessage.h index cb14c48dd9f..aeee34045ff 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplemessage.h +++ b/messagebus/src/vespa/messagebus/testlib/simplemessage.h @@ -8,9 +8,9 @@ namespace mbus { class SimpleMessage : public Message { private: - string _value; - bool _hasSeqId; - uint64_t _seqId; + string _value; + bool _hasSeqId; + uint64_t _seqId; public: SimpleMessage(const string &str); @@ -25,9 +25,7 @@ public: bool hasSequenceId() const override; uint64_t getSequenceId() const override; uint32_t getApproxSize() const override; - uint8_t priority() const override { return 8; } - string toString() const override { return _value; } }; diff --git a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h index 843b7675b96..0551d177898 100644 --- a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h +++ b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h @@ -2,9 +2,8 @@ #pragma once -#include <map> -#include <string> #include <vespa/messagebus/iprotocol.h> +#include <map> namespace mbus { @@ -49,10 +48,7 @@ public: */ SimpleProtocol(); - /** - * Frees up any allocated resources. - */ - virtual ~SimpleProtocol(); + ~SimpleProtocol(); /** * Registers a policy factory with this protocol under a given name. Whenever a policy is requested that @@ -72,19 +68,10 @@ public: */ static void simpleMerge(RoutingContext &ctx); - // Implements IProtocol. const string & getName() const override; - - // Implements IProtocol. - IRoutingPolicy::UP createPolicy(const string &name, - const string ¶m) const override; - - // Implements IProtocol. + IRoutingPolicy::UP createPolicy(const string &name, const string ¶m) const override; Blob encode(const vespalib::Version &version, const Routable &routable) const override; - - // Implements IProtocol. Routable::UP decode(const vespalib::Version &version, BlobRef data) const override; }; } // namespace mbus - diff --git a/messagebus/src/vespa/messagebus/testlib/simplereply.h b/messagebus/src/vespa/messagebus/testlib/simplereply.h index 8016a517453..3b9ac7fe21e 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplereply.h +++ b/messagebus/src/vespa/messagebus/testlib/simplereply.h @@ -2,9 +2,8 @@ #pragma once -#include <string> -#include <vespa/messagebus/reply.h> #include "simplemessage.h" +#include <vespa/messagebus/reply.h> namespace mbus { @@ -19,11 +18,10 @@ public: virtual ~SimpleReply(); void setValue(const string &value); const string &getValue() const; - virtual const string & getProtocol() const override; - virtual uint32_t getType() const override; + const string & getProtocol() const override; + uint32_t getType() const override; uint8_t priority() const override { return 8; } }; } // namespace mbus - diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp index b3f02b1ad58..fa71cb9f9ad 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp @@ -20,7 +20,8 @@ public: guard.wait(); } } - virtual void PerformTask() override { + + void PerformTask() override { vespalib::MonitorGuard guard(_mon); _done = true; guard.signal(); diff --git a/messagebus/src/vespa/messagebus/testlib/slobrok.h b/messagebus/src/vespa/messagebus/testlib/slobrok.h index 2f8d4180ba5..1677f6635f7 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.h +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.h @@ -2,7 +2,6 @@ #pragma once -#include <memory> #include <vespa/messagebus/common.h> #include <vespa/slobrok/cfg.h> |