diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-03 22:46:03 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-04-04 16:36:18 +0200 |
commit | 37cfa9ab6b103ae733a783cde18c8384e0ace507 (patch) | |
tree | 99b4ec1964a7a392b4aec133c4b20a4a40ab0002 /slobrok | |
parent | 5a48a81c4134bae524aa66e1e49624f678c8b6ce (diff) |
Override
Diffstat (limited to 'slobrok')
-rw-r--r-- | slobrok/src/vespa/slobrok/cfg.h | 3 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/sblist.h | 6 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/sbmirror.h | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/sbregister.h | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/exchange_manager.h | 2 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/managed_rpc_server.h | 6 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/metrics_producer.cpp | 7 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/monitor.h | 8 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/remote_check.h | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/remote_slobrok.cpp | 17 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/remote_slobrok.h | 15 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpc_server_manager.h | 10 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpchooks.cpp | 8 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/sbenv.cpp | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/sbenv.h | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/selfcheck.h | 7 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/slobrokserver.h | 2 |
17 files changed, 44 insertions, 67 deletions
diff --git a/slobrok/src/vespa/slobrok/cfg.h b/slobrok/src/vespa/slobrok/cfg.h index cb660cd0222..e0fa8927d31 100644 --- a/slobrok/src/vespa/slobrok/cfg.h +++ b/slobrok/src/vespa/slobrok/cfg.h @@ -1,9 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <string> -#include <vector> -#include <memory> #include <vespa/vespalib/util/ptrholder.h> #include <vespa/config-slobroks.h> #include <vespa/config/config.h> diff --git a/slobrok/src/vespa/slobrok/sblist.h b/slobrok/src/vespa/slobrok/sblist.h index 4265c2a1d57..53962363609 100644 --- a/slobrok/src/vespa/slobrok/sblist.h +++ b/slobrok/src/vespa/slobrok/sblist.h @@ -1,10 +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 <string> -#include <vector> -#include <vespa/vespalib/util/sync.h> #include "cfg.h" +#include <vespa/vespalib/util/sync.h> namespace slobrok { namespace api { @@ -24,7 +22,7 @@ public: * should be called at least once. * @param specList should not be an empty list. **/ - virtual void setup(const std::vector<std::string> &specList); + void setup(const std::vector<std::string> &specList) override; /** * retrieve the spec for next slobrok server to try. diff --git a/slobrok/src/vespa/slobrok/sbmirror.h b/slobrok/src/vespa/slobrok/sbmirror.h index 2193fee487f..c9bca70885f 100644 --- a/slobrok/src/vespa/slobrok/sbmirror.h +++ b/slobrok/src/vespa/slobrok/sbmirror.h @@ -72,10 +72,10 @@ private: MirrorAPI &operator=(const MirrorAPI &); /** from FNET_Task, polls slobrok **/ - void PerformTask(); + void PerformTask() override; /** from FRT_IRequestWait **/ - void RequestDone(FRT_RPCRequest *req); + void RequestDone(FRT_RPCRequest *req) override; void updateTo(SpecList& newSpecs, uint32_t newGen); diff --git a/slobrok/src/vespa/slobrok/sbregister.h b/slobrok/src/vespa/slobrok/sbregister.h index 6810a4d506b..7a71db8d480 100644 --- a/slobrok/src/vespa/slobrok/sbregister.h +++ b/slobrok/src/vespa/slobrok/sbregister.h @@ -75,13 +75,13 @@ private: bool match(const char *name, const char *pattern); /** from FNET_Task, poll slobrok **/ - void PerformTask(); + void PerformTask() override; void handleReqDone(); // implementation detail of PerformTask void handleReconnect(); // implementation detail of PerformTask void handlePending(); // implementation detail of PerformTask /** from FRT_IRequestWait **/ - void RequestDone(FRT_RPCRequest *req); + void RequestDone(FRT_RPCRequest *req) override; FRT_Supervisor &_orb; RPCHooks _hooks; diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.h b/slobrok/src/vespa/slobrok/server/exchange_manager.h index b13d64e64f0..20cf03e921a 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.h +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.h @@ -64,7 +64,7 @@ private: WorkItem& operator= (const WorkItem&); // not used public: void expedite(); - virtual void RequestDone(FRT_RPCRequest *req); + void RequestDone(FRT_RPCRequest *req) override; WorkItem(WorkPackage &pkg, RemoteSlobrok *rem, FRT_RPCRequest *req); diff --git a/slobrok/src/vespa/slobrok/server/managed_rpc_server.h b/slobrok/src/vespa/slobrok/server/managed_rpc_server.h index 07e0bdaf947..4ade368e623 100644 --- a/slobrok/src/vespa/slobrok/server/managed_rpc_server.h +++ b/slobrok/src/vespa/slobrok/server/managed_rpc_server.h @@ -36,7 +36,7 @@ public: ManagedRpcServer(const char *name, const char *spec, IRpcServerManager &manager); - virtual ~ManagedRpcServer(); + ~ManagedRpcServer(); void healthCheck(); @@ -50,8 +50,8 @@ private: bool validateRpcServer(uint32_t numstrings, FRT_StringValue *strings); public: - virtual void RequestDone(FRT_RPCRequest *req); - virtual void notifyDisconnected(); // lost connection to service + void RequestDone(FRT_RPCRequest *req) override; + void notifyDisconnected() override; // lost connection to service }; //----------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/server/metrics_producer.cpp b/slobrok/src/vespa/slobrok/server/metrics_producer.cpp index 7ac04e1b142..09af3eca194 100644 --- a/slobrok/src/vespa/slobrok/server/metrics_producer.cpp +++ b/slobrok/src/vespa/slobrok/server/metrics_producer.cpp @@ -1,8 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> #include "metrics_producer.h" - -#include <vespa/fnet/frt/frt.h> #include <vespa/vespalib/data/slime/slime.h> namespace slobrok { @@ -13,7 +10,7 @@ class MetricsSnapshotter : public FNET_Task { MetricsProducer &_owner; - void PerformTask() { + void PerformTask() override { _owner.snapshot(); Schedule(60.0); } @@ -25,7 +22,7 @@ public: Schedule(60.0); } - virtual ~MetricsSnapshotter() { Kill(); } + ~MetricsSnapshotter() { Kill(); } }; class MetricSnapshot diff --git a/slobrok/src/vespa/slobrok/server/monitor.h b/slobrok/src/vespa/slobrok/server/monitor.h index 990684df9fc..a71c6b69821 100644 --- a/slobrok/src/vespa/slobrok/server/monitor.h +++ b/slobrok/src/vespa/slobrok/server/monitor.h @@ -28,14 +28,14 @@ private: public: explicit Monitor(IMonitoredServer& owner, FRT_Supervisor &supervisor); - virtual ~Monitor(); + ~Monitor(); void enable(FRT_Target *monitorTarget); void disable(); private: void disconnect(); - virtual HP_RetCode HandlePacket(FNET_Packet *packet, - FNET_Context context); - virtual void PerformTask(); + HP_RetCode HandlePacket(FNET_Packet *packet, + FNET_Context context) override; + void PerformTask() override; }; //----------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/server/remote_check.h b/slobrok/src/vespa/slobrok/server/remote_check.h index eaba4041883..aa0326c5fbf 100644 --- a/slobrok/src/vespa/slobrok/server/remote_check.h +++ b/slobrok/src/vespa/slobrok/server/remote_check.h @@ -32,9 +32,9 @@ public: RpcServerMap& rpcsrvmap, RpcServerManager& rpcsrvman, ExchangeManager& exchanger); - virtual ~RemoteCheck(); + ~RemoteCheck(); private: - virtual void PerformTask(); + void PerformTask() override; }; } // namespace slobrok diff --git a/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp b/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp index 42bdbd6373e..23b8fc75e50 100644 --- a/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp +++ b/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp @@ -1,27 +1,18 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> - -#include <vespa/log/log.h> -LOG_SETUP(".rpcserver"); - -#include <vector> -#include <deque> -#include <stdlib.h> #include "remote_slobrok.h" -#include "ok_state.h" -#include "named_service.h" #include "rpc_server_map.h" -#include "rpc_server_manager.h" #include "sbenv.h" -#include "cmd.h" + +#include <vespa/log/log.h> +LOG_SETUP(".rpcserver"); namespace slobrok { namespace { class IgnoreReqDone: public FRT_IRequestWait { - void RequestDone(FRT_RPCRequest *req) { + void RequestDone(FRT_RPCRequest *req) override { req->SubRef(); } }; diff --git a/slobrok/src/vespa/slobrok/server/remote_slobrok.h b/slobrok/src/vespa/slobrok/server/remote_slobrok.h index a8bd5ca908c..fdc4c6e492b 100644 --- a/slobrok/src/vespa/slobrok/server/remote_slobrok.h +++ b/slobrok/src/vespa/slobrok/server/remote_slobrok.h @@ -48,10 +48,10 @@ private: Reconnecter &operator=(const Reconnecter &); // not used public: explicit Reconnecter(FNET_Scheduler *sched, RemoteSlobrok &owner); - virtual ~Reconnecter(); + ~Reconnecter(); void scheduleTryConnect(); void disable(); - virtual void PerformTask(); + void PerformTask() override; }; private: @@ -74,7 +74,7 @@ private: public: RemoteSlobrok(const char *name, const char *spec, ExchangeManager &manager); - virtual ~RemoteSlobrok(); + ~RemoteSlobrok(); void fail(); bool isConnected() const { return (_remote != NULL); } @@ -87,13 +87,12 @@ public: const char *getSpec() const { return _rpcserver.getSpec(); } // interfaces implemented: - virtual void notifyFailedRpcSrv(ManagedRpcServer *rpcsrv, std::string errmsg); - virtual void notifyOkRpcSrv(ManagedRpcServer *rpcsrv); - virtual void RequestDone(FRT_RPCRequest *req); - virtual FRT_Supervisor *getSupervisor(); + void notifyFailedRpcSrv(ManagedRpcServer *rpcsrv, std::string errmsg) override; + void notifyOkRpcSrv(ManagedRpcServer *rpcsrv) override; + void RequestDone(FRT_RPCRequest *req) override; + FRT_Supervisor *getSupervisor() override; }; //----------------------------------------------------------------------------- } // namespace slobrok - diff --git a/slobrok/src/vespa/slobrok/server/rpc_server_manager.h b/slobrok/src/vespa/slobrok/server/rpc_server_manager.h index e9157cba269..b355c39c77b 100644 --- a/slobrok/src/vespa/slobrok/server/rpc_server_manager.h +++ b/slobrok/src/vespa/slobrok/server/rpc_server_manager.h @@ -99,12 +99,12 @@ public: const char *spec); RpcServerManager(SBEnv &sbenv); - virtual ~RpcServerManager(); + ~RpcServerManager(); - virtual void PerformTask(); - virtual void notifyFailedRpcSrv(ManagedRpcServer *rpcsrv, std::string errmsg); - virtual void notifyOkRpcSrv(ManagedRpcServer *rpcsrv); - virtual FRT_Supervisor *getSupervisor(); + void PerformTask() override; + void notifyFailedRpcSrv(ManagedRpcServer *rpcsrv, std::string errmsg) override; + void notifyOkRpcSrv(ManagedRpcServer *rpcsrv) override; + FRT_Supervisor *getSupervisor() override; }; //----------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp index a67ea45812b..2eeafe7bbda 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp +++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp @@ -1,7 +1,5 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -#include <vespa/fastos/fastos.h> -#include <vespa/vespalib/component/vtag.h> -#include <vespa/fnet/frt/frt.h> + #include "rpchooks.h" #include "ok_state.h" #include "named_service.h" @@ -9,11 +7,9 @@ #include "rpc_server_manager.h" #include "remote_slobrok.h" #include "sbenv.h" -#include "visible_map.h" #include "rpcmirror.h" #include <vespa/log/log.h> - LOG_SETUP(".rpchooks"); namespace slobrok { @@ -26,7 +22,7 @@ class MetricsReport : public FNET_Task { RPCHooks &_owner; - void PerformTask() { + void PerformTask() override { _owner.reportMetrics(); Schedule(300.0); } diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 2217b976aa1..a766c6cfdf8 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -48,8 +48,8 @@ private: public: ConfigTask(FNET_Scheduler *sched, Configurator& configurator); - virtual ~ConfigTask(); - virtual void PerformTask(); + ~ConfigTask(); + void PerformTask() override; }; diff --git a/slobrok/src/vespa/slobrok/server/sbenv.h b/slobrok/src/vespa/slobrok/server/sbenv.h index e77ff1504aa..009fa6c6fa7 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.h +++ b/slobrok/src/vespa/slobrok/server/sbenv.h @@ -48,7 +48,7 @@ private: SBEnv(const SBEnv &); // Not used SBEnv &operator=(const SBEnv &); // Not used - void setup(const std::vector<std::string> &cfg); + void setup(const std::vector<std::string> &cfg) override; std::vector<std::string> _partnerList; std::unique_ptr<ManagedRpcServer> _me; @@ -61,7 +61,7 @@ private: public: explicit SBEnv(const ConfigShim &shim); - virtual ~SBEnv(); + ~SBEnv(); FNET_Transport *getTransport() { return _transport.get(); } FNET_Scheduler *getScheduler() { return _transport->GetScheduler(); } diff --git a/slobrok/src/vespa/slobrok/server/selfcheck.h b/slobrok/src/vespa/slobrok/server/selfcheck.h index f8274b44767..4631b929352 100644 --- a/slobrok/src/vespa/slobrok/server/selfcheck.h +++ b/slobrok/src/vespa/slobrok/server/selfcheck.h @@ -1,8 +1,7 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/fnet/fnet.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/task.h> namespace slobrok { @@ -30,9 +29,9 @@ public: explicit SelfCheck(FNET_Scheduler *sched, RpcServerMap& rpcsrvmap, RpcServerManager& rpcsrvman); - virtual ~SelfCheck(); + ~SelfCheck(); private: - virtual void PerformTask(); + void PerformTask() override; }; } // namespace slobrok diff --git a/slobrok/src/vespa/slobrok/server/slobrokserver.h b/slobrok/src/vespa/slobrok/server/slobrokserver.h index 500ff315fa3..a87902d0aa1 100644 --- a/slobrok/src/vespa/slobrok/server/slobrokserver.h +++ b/slobrok/src/vespa/slobrok/server/slobrokserver.h @@ -22,7 +22,7 @@ public: SlobrokServer(uint32_t port); ~SlobrokServer(); - virtual void run(); + void run() override; void stop() { _env.shutdown(); } }; |