diff options
56 files changed, 145 insertions, 145 deletions
diff --git a/messagebus/src/tests/advancedrouting/advancedrouting.cpp b/messagebus/src/tests/advancedrouting/advancedrouting.cpp index 26e62ca7956..ffd3db9440b 100644 --- a/messagebus/src/tests/advancedrouting/advancedrouting.cpp +++ b/messagebus/src/tests/advancedrouting/advancedrouting.cpp @@ -42,7 +42,7 @@ private: bool testTrace(const std::vector<string> &expected, const Trace &trace); public: - int Main(); + int Main() override; void testAdvanced(TestData &data); }; diff --git a/messagebus/src/tests/bucketsequence/bucketsequence.cpp b/messagebus/src/tests/bucketsequence/bucketsequence.cpp index 2661a0e86e1..9438b60a637 100644 --- a/messagebus/src/tests/bucketsequence/bucketsequence.cpp +++ b/messagebus/src/tests/bucketsequence/bucketsequence.cpp @@ -17,7 +17,7 @@ TEST_SETUP(Test); class MyMessage : public SimpleMessage { public: MyMessage() : SimpleMessage("foo") { } - bool hasBucketSequence() { return true; } + bool hasBucketSequence() override { return true; } }; int diff --git a/messagebus/src/tests/choke/choke.cpp b/messagebus/src/tests/choke/choke.cpp index 4c223f6a55a..2f4005cdb41 100644 --- a/messagebus/src/tests/choke/choke.cpp +++ b/messagebus/src/tests/choke/choke.cpp @@ -39,7 +39,7 @@ private: Message::UP createMessage(const string &msg); public: - int Main(); + int Main() override; void testMaxCount(TestData &data); void testMaxSize(TestData &data); }; diff --git a/messagebus/src/tests/configagent/configagent.cpp b/messagebus/src/tests/configagent/configagent.cpp index 29b58494c8a..eb99cd739a0 100644 --- a/messagebus/src/tests/configagent/configagent.cpp +++ b/messagebus/src/tests/configagent/configagent.cpp @@ -18,8 +18,8 @@ private: bool checkTables(uint32_t numTables); public: - int Main(); - bool setupRouting(const RoutingSpec &spec); + int Main() override; + bool setupRouting(const RoutingSpec &spec) override; }; TEST_APPHOOK(Test); diff --git a/messagebus/src/tests/context/context.cpp b/messagebus/src/tests/context/context.cpp index 99d674c4997..5ad36df7c72 100644 --- a/messagebus/src/tests/context/context.cpp +++ b/messagebus/src/tests/context/context.cpp @@ -27,7 +27,7 @@ struct Handler : public IMessageHandler ~Handler() { session.reset(); } - virtual void handleMessage(Message::UP msg) { + virtual void handleMessage(Message::UP msg) override { session->acknowledge(std::move(msg)); } }; diff --git a/messagebus/src/tests/loadbalance/loadbalance.cpp b/messagebus/src/tests/loadbalance/loadbalance.cpp index 7e917ee79c7..83ff4c042da 100644 --- a/messagebus/src/tests/loadbalance/loadbalance.cpp +++ b/messagebus/src/tests/loadbalance/loadbalance.cpp @@ -28,7 +28,7 @@ struct Handler : public IMessageHandler ~Handler() { session.reset(); } - virtual void handleMessage(Message::UP msg) { + virtual void handleMessage(Message::UP msg) override { ++cnt; session->acknowledge(std::move(msg)); } diff --git a/messagebus/src/tests/messagebus/messagebus.cpp b/messagebus/src/tests/messagebus/messagebus.cpp index ecfec5ac873..25d0ed51711 100644 --- a/messagebus/src/tests/messagebus/messagebus.cpp +++ b/messagebus/src/tests/messagebus/messagebus.cpp @@ -117,7 +117,7 @@ private: std::vector<Search*> searchVec; public: - int Main(); + int Main() override; void testSendToAny(); void testSendToCol(); void testSendToAnyThenCol(); diff --git a/messagebus/src/tests/messageordering/messageordering.cpp b/messagebus/src/tests/messageordering/messageordering.cpp index 0c102915cb1..e80505b2e89 100644 --- a/messagebus/src/tests/messageordering/messageordering.cpp +++ b/messagebus/src/tests/messageordering/messageordering.cpp @@ -46,7 +46,7 @@ public: _destinationSession(0), _messageCounter(0) {} - virtual void handleMessage(Message::UP msg) + virtual void handleMessage(Message::UP msg) override { SimpleMessage& simpleMsg(dynamic_cast<SimpleMessage&>(*msg)); LOG(spam, "Attempting to acquire lock for %s", @@ -90,7 +90,7 @@ class VerifyReplyReceptor : public IReplyHandler public: ~VerifyReplyReceptor(); VerifyReplyReceptor(); - void handleReply(Reply::UP reply); + void handleReply(Reply::UP reply) override; void waitUntilDone(int waitForCount) const; const std::string& getFailure() const { return _failure; } }; diff --git a/messagebus/src/tests/messenger/messenger.cpp b/messagebus/src/tests/messenger/messenger.cpp index a736814aa3d..5cf3625523f 100644 --- a/messagebus/src/tests/messenger/messenger.cpp +++ b/messagebus/src/tests/messenger/messenger.cpp @@ -13,11 +13,11 @@ TEST_SETUP(Test); class ThrowException : public Messenger::ITask { public: - void run() { + void run() override { throw std::exception(); } - uint8_t priority() const { + uint8_t priority() const override { return 0; } }; @@ -33,11 +33,11 @@ public: // empty } - void run() { + void run() override { _barrier.await(); } - uint8_t priority() const { + uint8_t priority() const override { return 0; } }; diff --git a/messagebus/src/tests/oos/oos.cpp b/messagebus/src/tests/oos/oos.cpp index 0ff93cecd7d..b19de4a94f8 100644 --- a/messagebus/src/tests/oos/oos.cpp +++ b/messagebus/src/tests/oos/oos.cpp @@ -31,7 +31,7 @@ struct Handler : public IMessageHandler ~Handler() { session.reset(); } - virtual void handleMessage(Message::UP msg) { + virtual void handleMessage(Message::UP msg) override { session->acknowledge(std::move(msg)); } }; @@ -46,7 +46,7 @@ private: public: Test(); - int Main(); + int Main() override; }; TEST_APPHOOK(Test); diff --git a/messagebus/src/tests/protocolrepository/protocolrepository.cpp b/messagebus/src/tests/protocolrepository/protocolrepository.cpp index e1b1d1402dd..cf1d77bdc7e 100644 --- a/messagebus/src/tests/protocolrepository/protocolrepository.cpp +++ b/messagebus/src/tests/protocolrepository/protocolrepository.cpp @@ -23,13 +23,13 @@ public: } const string & - getName() const + getName() const override { return _name; } IRoutingPolicy::UP - createPolicy(const string &name, const string ¶m) const + createPolicy(const string &name, const string ¶m) const override { (void)name; (void)param; @@ -37,7 +37,7 @@ public: } Blob - encode(const vespalib::Version &version, const Routable &routable) const + encode(const vespalib::Version &version, const Routable &routable) const override { (void)version; (void)routable; @@ -45,7 +45,7 @@ public: } Routable::UP - decode(const vespalib::Version &version, BlobRef data) const + decode(const vespalib::Version &version, BlobRef data) const override { (void)version; (void)data; diff --git a/messagebus/src/tests/replygate/replygate.cpp b/messagebus/src/tests/replygate/replygate.cpp index 09368da3974..d190f278be4 100644 --- a/messagebus/src/tests/replygate/replygate.cpp +++ b/messagebus/src/tests/replygate/replygate.cpp @@ -44,7 +44,7 @@ struct MySender : public IMessageHandler { // giving a sync reply here is against the API contract, but it is // ok for testing. - virtual void handleMessage(Message::UP msg) { + virtual void handleMessage(Message::UP msg) override { Reply::UP reply(new MyReply()); msg->swapState(*reply); IReplyHandler &handler = reply->getCallStack().pop(*reply); diff --git a/messagebus/src/tests/resender/resender.cpp b/messagebus/src/tests/resender/resender.cpp index c559f244a62..dad8ef73e68 100644 --- a/messagebus/src/tests/resender/resender.cpp +++ b/messagebus/src/tests/resender/resender.cpp @@ -66,7 +66,7 @@ private: void replyFromDestination(TestData &data, Message::UP msg, uint32_t errorCode, double retryDelay); public: - int Main(); + int Main() override; void testRetryTag(TestData &data); void testRetryEnabledTag(TestData &data); void testTransientError(TestData &data); diff --git a/messagebus/src/tests/result/result.cpp b/messagebus/src/tests/result/result.cpp index 1b081f5fc9e..a404135d64c 100644 --- a/messagebus/src/tests/result/result.cpp +++ b/messagebus/src/tests/result/result.cpp @@ -28,7 +28,7 @@ struct Test : public vespalib::TestApp { Result sendOk(Message::UP msg); Result sendFail(Message::UP msg); - int Main(); + int Main() override; }; Result diff --git a/messagebus/src/tests/routablequeue/routablequeue.cpp b/messagebus/src/tests/routablequeue/routablequeue.cpp index 09d14b03983..a6bd66bd5df 100644 --- a/messagebus/src/tests/routablequeue/routablequeue.cpp +++ b/messagebus/src/tests/routablequeue/routablequeue.cpp @@ -17,7 +17,7 @@ private: public: TestMessage(uint32_t id) : SimpleMessage(""), _id(id) { ++_cnt; } virtual ~TestMessage() { --_cnt; } - virtual uint32_t getType() const { return _id; } + virtual uint32_t getType() const override { return _id; } static uint32_t getCnt() { return _cnt; } }; uint32_t TestMessage::_cnt = 0; @@ -29,7 +29,7 @@ private: public: TestReply(uint32_t id) : SimpleReply(""), _id(id) { ++_cnt; } virtual ~TestReply() { --_cnt; } - virtual uint32_t getType() const { return _id; } + virtual uint32_t getType() const override { return _id; } static uint32_t getCnt() { return _cnt; } }; uint32_t TestReply::_cnt = 0; diff --git a/messagebus/src/tests/routeparser/routeparser.cpp b/messagebus/src/tests/routeparser/routeparser.cpp index d5522a7167a..a00cea825ba 100644 --- a/messagebus/src/tests/routeparser/routeparser.cpp +++ b/messagebus/src/tests/routeparser/routeparser.cpp @@ -20,7 +20,7 @@ using namespace mbus; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; void testHopParser(); void testHopParserErrors(); void testRouteParser(); diff --git a/messagebus/src/tests/routing/routing.cpp b/messagebus/src/tests/routing/routing.cpp index be0a69e855a..506d003a8b7 100644 --- a/messagebus/src/tests/routing/routing.cpp +++ b/messagebus/src/tests/routing/routing.cpp @@ -59,7 +59,7 @@ public: const std::vector<uint32_t> consumableErrors, const std::vector<Route> routes, uint32_t idxRemove); - void merge(RoutingContext &ctx); + void merge(RoutingContext &ctx) override; }; RemoveReplyPolicy::RemoveReplyPolicy(bool selectOnRetry, @@ -87,7 +87,7 @@ public: RemoveReplyPolicyFactory(bool selectOnRetry, const std::vector<uint32_t> &consumableErrors, uint32_t idxRemove); - IRoutingPolicy::UP create(const string ¶m); + IRoutingPolicy::UP create(const string ¶m) override; }; RemoveReplyPolicyFactory::RemoveReplyPolicyFactory(bool selectOnRetry, @@ -115,7 +115,7 @@ public: ReuseReplyPolicy(bool selectOnRetry, const std::vector<uint32_t> &errorMask, const std::vector<Route> &routes); - void merge(RoutingContext &ctx); + void merge(RoutingContext &ctx) override; }; ReuseReplyPolicy::ReuseReplyPolicy(bool selectOnRetry, @@ -164,7 +164,7 @@ private: public: ReuseReplyPolicyFactory(bool selectOnRetry, const std::vector<uint32_t> &errorMask); - IRoutingPolicy::UP create(const string ¶m); + IRoutingPolicy::UP create(const string ¶m) override; }; ReuseReplyPolicyFactory::ReuseReplyPolicyFactory(bool selectOnRetry, @@ -193,8 +193,8 @@ public: SetReplyPolicy(bool selectOnRetry, const std::vector<uint32_t> &errors, const string ¶m); - void select(RoutingContext &ctx); - void merge(RoutingContext &ctx); + void select(RoutingContext &ctx) override; + void merge(RoutingContext &ctx) override; }; SetReplyPolicy::SetReplyPolicy(bool selectOnRetry, @@ -236,7 +236,7 @@ private: public: SetReplyPolicyFactory(bool selectOnRetry, const std::vector<uint32_t> &errors); - IRoutingPolicy::UP create(const string ¶m); + IRoutingPolicy::UP create(const string ¶m) override; }; SetReplyPolicyFactory::SetReplyPolicyFactory(bool selectOnRetry, @@ -254,26 +254,26 @@ SetReplyPolicyFactory::create(const string ¶m) } class TestException : public std::exception { - virtual const char* what() const throw() { + virtual const char* what() const throw() override { return "{test exception}"; } }; class SelectExceptionPolicy : public IRoutingPolicy { public: - void select(RoutingContext &ctx) { + void select(RoutingContext &ctx) override { (void)ctx; throw TestException(); } - void merge(RoutingContext &ctx) { + void merge(RoutingContext &ctx) override { (void)ctx; } }; class SelectExceptionPolicyFactory : public SimpleProtocol::IPolicyFactory { public: - IRoutingPolicy::UP create(const string ¶m) { + IRoutingPolicy::UP create(const string ¶m) override { (void)param; return IRoutingPolicy::UP(new SelectExceptionPolicy()); } @@ -290,11 +290,11 @@ public: // empty } - void select(RoutingContext &ctx) { + void select(RoutingContext &ctx) override { ctx.addChild(Route::parse(_select)); } - void merge(RoutingContext &ctx) { + void merge(RoutingContext &ctx) override { (void)ctx; throw TestException(); } @@ -302,7 +302,7 @@ public: class MergeExceptionPolicyFactory : public SimpleProtocol::IPolicyFactory { public: - IRoutingPolicy::UP create(const string ¶m) { + IRoutingPolicy::UP create(const string ¶m) override { return IRoutingPolicy::UP(new MergeExceptionPolicy(param)); } }; @@ -336,7 +336,7 @@ public: } IRoutingPolicy::UP - create(const string ¶m); + create(const string ¶m) override; static MyPolicyFactory::SP newInstance(const string &selectRoute, @@ -419,7 +419,7 @@ public: } virtual void - select(RoutingContext &ctx) + select(RoutingContext &ctx) override { if (!_parent._selectRoute.empty()) { ctx.addChild(Route::parse(_parent._selectRoute)); @@ -435,7 +435,7 @@ public: } virtual void - merge(RoutingContext &ctx) + merge(RoutingContext &ctx) override { if (_parent._mergeError != ErrorCode::NONE) { Reply::UP reply(new EmptyReply()); @@ -494,7 +494,7 @@ private: static const double RECEPTOR_TIMEOUT; public: - int Main(); + int Main() override; void testNoRoutingTable(TestData &data); void testUnknownRoute(TestData &data); void testNoRoute(TestData &data); diff --git a/messagebus/src/tests/routingcontext/routingcontext.cpp b/messagebus/src/tests/routingcontext/routingcontext.cpp index d8d76a3069c..6ee62b4d697 100644 --- a/messagebus/src/tests/routingcontext/routingcontext.cpp +++ b/messagebus/src/tests/routingcontext/routingcontext.cpp @@ -50,7 +50,7 @@ public: CustomPolicyFactory(bool forward, const std::vector<string> &all, const std::vector<string> &matched); - IRoutingPolicy::UP create(const string ¶m); + IRoutingPolicy::UP create(const string ¶m) override; }; class CustomPolicy : public IRoutingPolicy { @@ -59,8 +59,8 @@ private: public: CustomPolicy(CustomPolicyFactory &factory); - void select(RoutingContext &ctx); - void merge(RoutingContext &ctx); + void select(RoutingContext &ctx) override; + void merge(RoutingContext &ctx) override; }; CustomPolicy::CustomPolicy(CustomPolicyFactory &factory) : @@ -211,7 +211,7 @@ private: Message::UP createMessage(const string &msg); public: - int Main(); + int Main() override; void testSingleDirective(TestData &data); void testMoreDirectives(TestData &data); void testRecipientsRemain(TestData &data); diff --git a/messagebus/src/tests/routingspec/routingspec.cpp b/messagebus/src/tests/routingspec/routingspec.cpp index 32d235c0a11..6ca7fef44db 100644 --- a/messagebus/src/tests/routingspec/routingspec.cpp +++ b/messagebus/src/tests/routingspec/routingspec.cpp @@ -22,7 +22,7 @@ public: // empty } - bool setupRouting(const RoutingSpec &spec) { + bool setupRouting(const RoutingSpec &spec) override { _routing = spec; return true; } @@ -40,7 +40,7 @@ private: public: void testConstructors(); void testConfigGeneration(); - int Main(); + int Main() override; }; TEST_APPHOOK(Test); diff --git a/messagebus/src/tests/sendadapter/sendadapter.cpp b/messagebus/src/tests/sendadapter/sendadapter.cpp index f4973b96e31..bcac60d800a 100644 --- a/messagebus/src/tests/sendadapter/sendadapter.cpp +++ b/messagebus/src/tests/sendadapter/sendadapter.cpp @@ -26,11 +26,11 @@ private: public: typedef std::shared_ptr<TestProtocol> SP; - mbus::Blob encode(const vespalib::Version &version, const mbus::Routable &routable) const { + mbus::Blob encode(const vespalib::Version &version, const mbus::Routable &routable) const override { _lastVersion = version; return mbus::SimpleProtocol::encode(version, routable); } - mbus::Routable::UP decode(const vespalib::Version &version, mbus::BlobRef blob) const { + mbus::Routable::UP decode(const vespalib::Version &version, mbus::BlobRef blob) const override { _lastVersion = version; return mbus::SimpleProtocol::decode(version, blob); } @@ -70,7 +70,7 @@ private: void testSendAdapters(TestData &data); public: - int Main(); + int Main() override; }; TEST_APPHOOK(Test); diff --git a/messagebus/src/tests/sequencer/sequencer.cpp b/messagebus/src/tests/sequencer/sequencer.cpp index b2818cfa57d..6db2455c4a8 100644 --- a/messagebus/src/tests/sequencer/sequencer.cpp +++ b/messagebus/src/tests/sequencer/sequencer.cpp @@ -87,7 +87,7 @@ private: void testSyncId(); public: - int Main() { + int Main() override { TEST_INIT("sequencer_test"); testSyncNone(); TEST_FLUSH(); diff --git a/messagebus/src/tests/serviceaddress/serviceaddress.cpp b/messagebus/src/tests/serviceaddress/serviceaddress.cpp index e8fb670dd9b..ec2d1374e9b 100644 --- a/messagebus/src/tests/serviceaddress/serviceaddress.cpp +++ b/messagebus/src/tests/serviceaddress/serviceaddress.cpp @@ -26,7 +26,7 @@ using namespace mbus; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; void testAddrServiceAddress(); void testNameServiceAddress(); diff --git a/messagebus/src/tests/servicepool/servicepool.cpp b/messagebus/src/tests/servicepool/servicepool.cpp index 5cf4b8b6132..8601cfa8fee 100644 --- a/messagebus/src/tests/servicepool/servicepool.cpp +++ b/messagebus/src/tests/servicepool/servicepool.cpp @@ -14,7 +14,7 @@ private: void testMaxSize(); public: - int Main() { + int Main() override { TEST_INIT("servicepool_test"); testMaxSize(); TEST_FLUSH(); diff --git a/messagebus/src/tests/shutdown/shutdown.cpp b/messagebus/src/tests/shutdown/shutdown.cpp index d4c5544d469..5f5fe847f57 100644 --- a/messagebus/src/tests/shutdown/shutdown.cpp +++ b/messagebus/src/tests/shutdown/shutdown.cpp @@ -26,7 +26,7 @@ private: void requireThatShutdownOnIntermediateWithPendingIsSafe(); public: - int Main() { + int Main() override { TEST_INIT("shutdown_test"); requireThatListenFailedIsExceptionSafe(); TEST_FLUSH(); diff --git a/messagebus/src/tests/sourcesession/sourcesession.cpp b/messagebus/src/tests/sourcesession/sourcesession.cpp index f70789d81af..24d99f5d44f 100644 --- a/messagebus/src/tests/sourcesession/sourcesession.cpp +++ b/messagebus/src/tests/sourcesession/sourcesession.cpp @@ -34,7 +34,7 @@ struct DelayedHandler : public IMessageHandler ~DelayedHandler() { session.reset(); } - virtual void handleMessage(Message::UP msg) { + virtual void handleMessage(Message::UP msg) override { // this will block the transport thread in the server messagebus, // but that should be ok, as we only want to test the timing in the // client messagebus... @@ -77,7 +77,7 @@ public: void testNoServices(); void testBlockingClose(); void testNonBlockingClose(); - int Main(); + int Main() override; }; void diff --git a/messagebus/src/tests/targetpool/targetpool.cpp b/messagebus/src/tests/targetpool/targetpool.cpp index 855784ec557..30744e74202 100644 --- a/messagebus/src/tests/targetpool/targetpool.cpp +++ b/messagebus/src/tests/targetpool/targetpool.cpp @@ -18,7 +18,7 @@ public: // empty } - uint64_t getMilliTime() const { + uint64_t getMilliTime() const override { return millis; } }; diff --git a/messagebus/src/tests/throttling/throttling.cpp b/messagebus/src/tests/throttling/throttling.cpp index 6d543318559..acc5b2ddc4d 100644 --- a/messagebus/src/tests/throttling/throttling.cpp +++ b/messagebus/src/tests/throttling/throttling.cpp @@ -35,7 +35,7 @@ public: // empty } - uint64_t getMilliTime() const { + uint64_t getMilliTime() const override { return _millis; } }; @@ -90,7 +90,7 @@ protected: void testMaxWindowSize(); public: - int Main(); + int Main() override; }; int diff --git a/messagebus/src/tests/timeout/timeout.cpp b/messagebus/src/tests/timeout/timeout.cpp index 8d6b1739776..d51ee34a08b 100644 --- a/messagebus/src/tests/timeout/timeout.cpp +++ b/messagebus/src/tests/timeout/timeout.cpp @@ -18,7 +18,7 @@ using namespace mbus; class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; void testZeroTimeout(); void testMessageExpires(); }; diff --git a/messagebus/src/tests/trace-roundtrip/trace-roundtrip.cpp b/messagebus/src/tests/trace-roundtrip/trace-roundtrip.cpp index 72158383807..5a9324257b5 100644 --- a/messagebus/src/tests/trace-roundtrip/trace-roundtrip.cpp +++ b/messagebus/src/tests/trace-roundtrip/trace-roundtrip.cpp @@ -28,8 +28,8 @@ private: IntermediateSession::UP _session; public: Proxy(MessageBus &bus); - void handleMessage(Message::UP msg); - void handleReply(Reply::UP reply); + void handleMessage(Message::UP msg) override; + void handleReply(Reply::UP reply) override; }; Proxy::Proxy(MessageBus &bus) @@ -57,7 +57,7 @@ private: DestinationSession::UP _session; public: Server(MessageBus &bus); - void handleMessage(Message::UP msg); + void handleMessage(Message::UP msg) override; }; Server::Server(MessageBus &bus) diff --git a/messagebus/src/vespa/messagebus/configagent.h b/messagebus/src/vespa/messagebus/configagent.h index 8b00f403061..9b84f84f8df 100644 --- a/messagebus/src/vespa/messagebus/configagent.h +++ b/messagebus/src/vespa/messagebus/configagent.h @@ -26,7 +26,7 @@ public: ConfigAgent(IConfigHandler & handler); // Implements IFetcherCallback - void configure(std::unique_ptr<messagebus::MessagebusConfig> config); + void configure(std::unique_ptr<messagebus::MessagebusConfig> config) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/destinationsession.h b/messagebus/src/vespa/messagebus/destinationsession.h index c69a1a71084..973d65ec152 100644 --- a/messagebus/src/vespa/messagebus/destinationsession.h +++ b/messagebus/src/vespa/messagebus/destinationsession.h @@ -80,7 +80,7 @@ public: * * @param message the Message */ - void handleMessage(Message::UP message); + void handleMessage(Message::UP message) override; /** * Returns the message handler of this session. diff --git a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h index 1e29d82cfc7..d552c3c48e9 100644 --- a/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h +++ b/messagebus/src/vespa/messagebus/dynamicthrottlepolicy.h @@ -165,13 +165,13 @@ public: uint32_t getMaxPendingCount() const { return (uint32_t)_windowSize; } // Implements IThrottlePolicy. - bool canSend(const Message &msg, uint32_t pendingCount); + bool canSend(const Message &msg, uint32_t pendingCount) override; // Implements IThrottlePolicy. - void processMessage(Message &msg); + void processMessage(Message &msg) override; // Implements IThrottlePolicy. - void processReply(Reply &reply); + void processReply(Reply &reply) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/emptyreply.h b/messagebus/src/vespa/messagebus/emptyreply.h index 53639e0fef0..f2d431c8ada 100644 --- a/messagebus/src/vespa/messagebus/emptyreply.h +++ b/messagebus/src/vespa/messagebus/emptyreply.h @@ -26,14 +26,14 @@ public: * * @return "" */ - virtual const string & getProtocol() const; + virtual const string & getProtocol() const override; /** * This method returns the message type id reserved for empty replies: 0 * * @return 0 */ - virtual uint32_t getType() const; + virtual uint32_t getType() const override; /** * Encodes this reply into an empty blob. @@ -42,7 +42,7 @@ public: */ virtual Blob encode() const; - uint8_t priority() const { return 8; } + 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 4876e30f516..064b223707f 100644 --- a/messagebus/src/vespa/messagebus/intermediatesession.h +++ b/messagebus/src/vespa/messagebus/intermediatesession.h @@ -88,10 +88,10 @@ public: const string getConnectionSpec() const; // Implements IMessageHandler. - void handleMessage(Message::UP message); + void handleMessage(Message::UP message) override; // Implements IReplyHandler. - void handleReply(Reply::UP reply); + void handleReply(Reply::UP reply) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/message.h b/messagebus/src/vespa/messagebus/message.h index 6afe305389a..6fc72af0055 100644 --- a/messagebus/src/vespa/messagebus/message.h +++ b/messagebus/src/vespa/messagebus/message.h @@ -38,7 +38,7 @@ public: virtual ~Message(); // Overrides Routable. - virtual void swapState(Routable &rhs); + virtual void swapState(Routable &rhs) override; /** * Returns the timestamp for when this message was last seen by message @@ -139,7 +139,7 @@ public: * * @return false */ - virtual bool isReply() const { return false; } + virtual bool isReply() const override { return false; } /** * Returns whether or not this message contains a sequence identifier that diff --git a/messagebus/src/vespa/messagebus/messagebus.cpp b/messagebus/src/vespa/messagebus/messagebus.cpp index f5a30c86d45..ecee7f3b57e 100644 --- a/messagebus/src/vespa/messagebus/messagebus.cpp +++ b/messagebus/src/vespa/messagebus/messagebus.cpp @@ -32,11 +32,11 @@ public: // empty } - void run() { + void run() override { _resender->resendScheduled(); } - uint8_t priority() const { + uint8_t priority() const override { return 255; } }; @@ -66,12 +66,12 @@ public: _gate.countDown(); } - void run() { + void run() override { _net.postShutdownHook(); _done = _msn.isEmpty(); } - uint8_t priority() const { + uint8_t priority() const override { return 255; } }; diff --git a/messagebus/src/vespa/messagebus/messagebus.h b/messagebus/src/vespa/messagebus/messagebus.h index bc4a08123a4..f97de608843 100644 --- a/messagebus/src/vespa/messagebus/messagebus.h +++ b/messagebus/src/vespa/messagebus/messagebus.h @@ -284,25 +284,25 @@ public: Messenger & getMessenger() { return *_msn; } // Implements IReplyHandler. - void handleReply(Reply::UP reply); + void handleReply(Reply::UP reply) override; // Implements IDiscardHandler. - void handleDiscard(Context ctx); + void handleDiscard(Context ctx) override; // Implements IMessageHandler. - void handleMessage(Message::UP msg); + void handleMessage(Message::UP msg) override; // Implements IConfigHandler. - bool setupRouting(const RoutingSpec &spec); + bool setupRouting(const RoutingSpec &spec) override; // Implements INetworkOwner. - IProtocol::SP getProtocol(const string &name); + IProtocol::SP getProtocol(const string &name) override; // Implements INetworkOwner. - void deliverMessage(Message::UP msg, const string &session); + void deliverMessage(Message::UP msg, const string &session) override; // Implements INetworkOwner. - void deliverReply(Reply::UP reply, IReplyHandler &handler); + void deliverReply(Reply::UP reply, IReplyHandler &handler) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/messenger.cpp b/messagebus/src/vespa/messagebus/messenger.cpp index 33887ea5cf4..928d38a9069 100644 --- a/messagebus/src/vespa/messagebus/messenger.cpp +++ b/messagebus/src/vespa/messagebus/messenger.cpp @@ -37,11 +37,11 @@ public: } } - void run() { + void run() override { _handler.handleMessage(std::move(_msg)); } - uint8_t priority() const { + uint8_t priority() const override { if (_msg.get() != NULL) { return _msg->priority(); } @@ -69,11 +69,11 @@ public: } } - void run() { + void run() override { _handler.handleReply(std::move(_reply)); } - uint8_t priority() const { + uint8_t priority() const override { if (_reply.get() != NULL) { return _reply->priority(); } @@ -97,11 +97,11 @@ public: _gate.countDown(); } - void run() { + void run() override { // empty } - uint8_t priority() const { + uint8_t priority() const override { return 255; } }; @@ -119,11 +119,11 @@ public: // empty } - void run() { + void run() override { _tasks.push_back(_task.release()); } - uint8_t priority() const { + uint8_t priority() const override { return 255; } }; @@ -140,13 +140,13 @@ public: // empty } - void run() { + void run() override { std::for_each(_tasks.begin(), _tasks.end(), DeleteFunctor<ITask>()); _tasks.clear(); SyncTask::run(); } - uint8_t priority() const { + uint8_t priority() const override { return 255; } }; diff --git a/messagebus/src/vespa/messagebus/messenger.h b/messagebus/src/vespa/messagebus/messenger.h index 2b534301576..fe76513eef9 100644 --- a/messagebus/src/vespa/messagebus/messenger.h +++ b/messagebus/src/vespa/messagebus/messenger.h @@ -48,7 +48,7 @@ private: protected: // Implements FastOS_Runnable. - void Run(FastOS_ThreadInterface *thread, void *arg); + 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 41c9bb2c3e0..8bc4f5921e0 100644 --- a/messagebus/src/vespa/messagebus/reply.h +++ b/messagebus/src/vespa/messagebus/reply.h @@ -42,14 +42,14 @@ public: virtual ~Reply(); // Inherit doc from Routable. - virtual void swapState(Routable &rhs); + virtual void swapState(Routable &rhs) override; /** * Inherited from Routable. Classifies this object as 'a reply'. * * @return true */ - virtual bool isReply() const; + virtual bool isReply() const override; /** * Add an Error to this Reply diff --git a/messagebus/src/vespa/messagebus/replygate.h b/messagebus/src/vespa/messagebus/replygate.h index add66544e02..72c9378c62c 100644 --- a/messagebus/src/vespa/messagebus/replygate.h +++ b/messagebus/src/vespa/messagebus/replygate.h @@ -43,7 +43,7 @@ public: * the matching Reply has been obtained. In order to obtain the matching * Reply, this method will push this object on the CallStack of the Message. */ - void handleMessage(Message::UP msg); + void handleMessage(Message::UP msg) override; /** * Forward or discard Reply. If the gate is still open, it will forward the @@ -51,10 +51,10 @@ public: * the Reply will be discarded. This method also decreases the reference * counter of this object. */ - void handleReply(Reply::UP reply); + void handleReply(Reply::UP reply) override; // Implements IDiscardHandler. - void handleDiscard(Context ctx); + void handleDiscard(Context ctx) override; /** * Close this gate. After this has been invoked, the gate will start to diff --git a/messagebus/src/vespa/messagebus/routablequeue.h b/messagebus/src/vespa/messagebus/routablequeue.h index f3174abf5f5..ea2b14b64f6 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); + virtual void handleMessage(Message::UP msg) override; /** * Handle a Reply by enqueuing it. * * @param reply the Reply to handle **/ - virtual void handleReply(Reply::UP reply); + virtual 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 1bd880947c1..ca0c3f39661 100644 --- a/messagebus/src/vespa/messagebus/sendproxy.h +++ b/messagebus/src/vespa/messagebus/sendproxy.h @@ -35,13 +35,13 @@ public: SendProxy(MessageBus &mbus, INetwork &net, Resender *resender); // Implements IDiscardHandler. - void handleDiscard(Context ctx); + void handleDiscard(Context ctx) override; // Implements IMessageHandler. - void handleMessage(Message::UP msg); + void handleMessage(Message::UP msg) override; // Implements IReplyHandler. - void handleReply(Reply::UP reply); + void handleReply(Reply::UP reply) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/sequencer.h b/messagebus/src/vespa/messagebus/sequencer.h index 4551ee032a2..1b7408ea547 100644 --- a/messagebus/src/vespa/messagebus/sequencer.h +++ b/messagebus/src/vespa/messagebus/sequencer.h @@ -72,7 +72,7 @@ public: * * @param msg The message to send. */ - void handleMessage(Message::UP msg); + void handleMessage(Message::UP msg) override; /** * Lookup the sequencing id of an incoming reply to pop the front of the corresponding queue, and then @@ -80,7 +80,7 @@ public: * * @param reply The reply received. */ - void handleReply(Reply::UP reply); + void handleReply(Reply::UP reply) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/sourcesession.h b/messagebus/src/vespa/messagebus/sourcesession.h index c40b5418ec1..32a68b9c84b 100644 --- a/messagebus/src/vespa/messagebus/sourcesession.h +++ b/messagebus/src/vespa/messagebus/sourcesession.h @@ -91,7 +91,7 @@ public: * * @param reply the Reply **/ - void handleReply(Reply::UP reply); + void handleReply(Reply::UP reply) override; /** * Close this session. This method will block until Reply objects have been obtained for all pending diff --git a/messagebus/src/vespa/messagebus/staticthrottlepolicy.h b/messagebus/src/vespa/messagebus/staticthrottlepolicy.h index e6d75dfd3c7..b7cc6bdfe99 100644 --- a/messagebus/src/vespa/messagebus/staticthrottlepolicy.h +++ b/messagebus/src/vespa/messagebus/staticthrottlepolicy.h @@ -71,13 +71,13 @@ public: uint64_t getPendingSize() const; // Implements IThrottlePolicy. - bool canSend(const Message &msg, uint32_t pendingCount); + bool canSend(const Message &msg, uint32_t pendingCount) override; // Implements IThrottlePolicy. - void processMessage(Message &msg); + void processMessage(Message &msg) override; // Implements IThrottlePolicy. - void processReply(Reply &reply); + void processReply(Reply &reply) override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/systemtimer.h b/messagebus/src/vespa/messagebus/systemtimer.h index b03f847718b..14156253067 100644 --- a/messagebus/src/vespa/messagebus/systemtimer.h +++ b/messagebus/src/vespa/messagebus/systemtimer.h @@ -13,7 +13,7 @@ namespace mbus { class SystemTimer : public ITimer { public: // Implements ITimer. - uint64_t getMilliTime() const; + uint64_t getMilliTime() const override; }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/testlib/custompolicy.h b/messagebus/src/vespa/messagebus/testlib/custompolicy.h index 83d6cf73eb6..953f4f3c92e 100644 --- a/messagebus/src/vespa/messagebus/testlib/custompolicy.h +++ b/messagebus/src/vespa/messagebus/testlib/custompolicy.h @@ -17,8 +17,8 @@ public: const std::vector<uint32_t> consumableErrors, const std::vector<Route> &routes); - virtual void select(RoutingContext &context); - virtual void merge(RoutingContext &context); + virtual void select(RoutingContext &context) override; + virtual void merge(RoutingContext &context) override; }; class CustomPolicyFactory : public SimpleProtocol::IPolicyFactory { @@ -32,7 +32,7 @@ public: CustomPolicyFactory(bool selectOnRetry, uint32_t consumableError); CustomPolicyFactory(bool selectOnRetry, const std::vector<uint32_t> consumableErrors); - IRoutingPolicy::UP create(const string ¶m); + IRoutingPolicy::UP create(const string ¶m) override; static void parseRoutes(const string &str, std::vector<Route> &routes); }; diff --git a/messagebus/src/vespa/messagebus/testlib/receptor.h b/messagebus/src/vespa/messagebus/testlib/receptor.h index d7a0376596e..c64e60eb6de 100644 --- a/messagebus/src/vespa/messagebus/testlib/receptor.h +++ b/messagebus/src/vespa/messagebus/testlib/receptor.h @@ -20,8 +20,8 @@ private: Receptor &operator=(const Receptor &); public: Receptor(); - virtual void handleMessage(Message::UP msg); - virtual void handleReply(Reply::UP reply); + virtual void handleMessage(Message::UP msg) override; + virtual void handleReply(Reply::UP reply) override; Message::UP getMessage(double maxWait = 120.0); Reply::UP getReply(double maxWait = 120.0); }; diff --git a/messagebus/src/vespa/messagebus/testlib/simplemessage.h b/messagebus/src/vespa/messagebus/testlib/simplemessage.h index c709397a89f..cb14c48dd9f 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplemessage.h +++ b/messagebus/src/vespa/messagebus/testlib/simplemessage.h @@ -20,15 +20,15 @@ public: void setValue(const string &value); const string &getValue() const; int getHash() const; - const string & getProtocol() const; - uint32_t getType() const; - bool hasSequenceId() const; - uint64_t getSequenceId() const; - uint32_t getApproxSize() const; + const string & getProtocol() const override; + uint32_t getType() const override; + bool hasSequenceId() const override; + uint64_t getSequenceId() const override; + uint32_t getApproxSize() const override; - uint8_t priority() const { return 8; } + uint8_t priority() const override { return 8; } - string toString() const { return _value; } + string toString() const override { return _value; } }; } // namespace mbus diff --git a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp index 564b07135db..c21e2661d6c 100644 --- a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp +++ b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.cpp @@ -16,27 +16,27 @@ const uint32_t SimpleProtocol::REPLY(2); class AllPolicy : public IRoutingPolicy { public: - void select(RoutingContext &ctx) { + void select(RoutingContext &ctx) override { std::vector<Route> recipients; ctx.getMatchedRecipients(recipients); ctx.addChildren(recipients); } - void merge(RoutingContext &ctx) { + void merge(RoutingContext &ctx) override { SimpleProtocol::simpleMerge(ctx); } }; class AllPolicyFactory : public SimpleProtocol::IPolicyFactory { public: - IRoutingPolicy::UP create(const string &) { + IRoutingPolicy::UP create(const string &) override { return IRoutingPolicy::UP(new AllPolicy()); } }; class HashPolicy : public IRoutingPolicy { public: - void select(RoutingContext &ctx) { + void select(RoutingContext &ctx) override { std::vector<Route> recipients; ctx.getMatchedRecipients(recipients); if (!recipients.empty()) { @@ -45,14 +45,14 @@ public: } } - void merge(RoutingContext &ctx) { + void merge(RoutingContext &ctx) override { SimpleProtocol::simpleMerge(ctx); } }; class HashPolicyFactory : public SimpleProtocol::IPolicyFactory { public: - IRoutingPolicy::UP create(const string &) { + IRoutingPolicy::UP create(const string &) override { return IRoutingPolicy::UP(new HashPolicy()); } }; diff --git a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h index 0a0dee5085a..843b7675b96 100644 --- a/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h +++ b/messagebus/src/vespa/messagebus/testlib/simpleprotocol.h @@ -73,17 +73,17 @@ public: static void simpleMerge(RoutingContext &ctx); // Implements IProtocol. - const string & getName() const; + const string & getName() const override; // Implements IProtocol. IRoutingPolicy::UP createPolicy(const string &name, - const string ¶m) const; + const string ¶m) const override; // Implements IProtocol. - Blob encode(const vespalib::Version &version, const Routable &routable) const; + Blob encode(const vespalib::Version &version, const Routable &routable) const override; // Implements IProtocol. - Routable::UP decode(const vespalib::Version &version, BlobRef data) const; + 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 6a33855976c..8016a517453 100644 --- a/messagebus/src/vespa/messagebus/testlib/simplereply.h +++ b/messagebus/src/vespa/messagebus/testlib/simplereply.h @@ -19,10 +19,10 @@ public: virtual ~SimpleReply(); void setValue(const string &value); const string &getValue() const; - virtual const string & getProtocol() const; - virtual uint32_t getType() const; + virtual const string & getProtocol() const override; + virtual uint32_t getType() const override; - uint8_t priority() const { return 8; } + 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 282797d461b..b3f02b1ad58 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.cpp +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.cpp @@ -20,7 +20,7 @@ public: guard.wait(); } } - virtual void PerformTask() { + virtual 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 28053e7b506..2f8d4180ba5 100644 --- a/messagebus/src/vespa/messagebus/testlib/slobrok.h +++ b/messagebus/src/vespa/messagebus/testlib/slobrok.h @@ -20,7 +20,7 @@ private: slobrok::SBEnv *_env; public: void setEnv(slobrok::SBEnv *env); - void Run(FastOS_ThreadInterface *, void *); + void Run(FastOS_ThreadInterface *, void *) override; }; FastOS_ThreadPool _pool; std::unique_ptr<slobrok::SBEnv> _env; diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.h b/messagebus/src/vespa/messagebus/testlib/testserver.h index 8070b499d99..92d2ac51c89 100644 --- a/messagebus/src/vespa/messagebus/testlib/testserver.h +++ b/messagebus/src/vespa/messagebus/testlib/testserver.h @@ -19,7 +19,7 @@ private: vespalib::Version _version; protected: - const vespalib::Version &getVersion() const { return _version; } + const vespalib::Version &getVersion() const override { return _version; } public: VersionedRPCNetwork(const RPCNetworkParams ¶ms); |