diff options
author | Arne H Juul <arnej@yahooinc.com> | 2021-09-16 14:33:28 +0000 |
---|---|---|
committer | Arne H Juul <arnej@yahooinc.com> | 2021-09-20 10:28:52 +0000 |
commit | 6cf9b1671fe888dba497496e2c8a75f2980ad32f (patch) | |
tree | 3f6e7894786c62c7e3c745475992897ab8a6df2d /slobrok | |
parent | 5ed228b3247ca234ad49904515f2db547f7d0f9f (diff) |
remove unused variables
Diffstat (limited to 'slobrok')
7 files changed, 8 insertions, 28 deletions
diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp index c0340e2432d..4bf52b295c0 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.cpp +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.cpp @@ -14,11 +14,9 @@ namespace slobrok { //----------------------------------------------------------------------------- -ExchangeManager::ExchangeManager(SBEnv &env, RpcServerMap &rpcsrvmap) +ExchangeManager::ExchangeManager(SBEnv &env) : _partners(), - _env(env), - _rpcsrvmanager(env.rpcServerManager()), - _rpcsrvmap(rpcsrvmap) + _env(env) { } diff --git a/slobrok/src/vespa/slobrok/server/exchange_manager.h b/slobrok/src/vespa/slobrok/server/exchange_manager.h index 18a20274a75..9b6fae00592 100644 --- a/slobrok/src/vespa/slobrok/server/exchange_manager.h +++ b/slobrok/src/vespa/slobrok/server/exchange_manager.h @@ -14,8 +14,6 @@ namespace slobrok { //----------------------------------------------------------------------------- class SBEnv; -class RpcServerMap; -class RpcServerManager; //----------------------------------------------------------------------------- @@ -78,20 +76,16 @@ private: }; SBEnv &_env; - RpcServerManager &_rpcsrvmanager; - RpcServerMap &_rpcsrvmap; vespalib::string diffLists(const ServiceMappingList &lhs, const ServiceMappingList &rhs); public: ExchangeManager(const ExchangeManager &) = delete; ExchangeManager &operator=(const ExchangeManager &) = delete; - ExchangeManager(SBEnv &env, RpcServerMap &rpcsrvmap); + ExchangeManager(SBEnv &env); ~ExchangeManager(); SBEnv &env() { return _env; } - RpcServerManager &rpcServerManager() { return _rpcsrvmanager; } - RpcServerMap &rpcServerMap() { return _rpcsrvmap; } OkState addPartner(const std::string & spec); void removePartner(const std::string & spec); diff --git a/slobrok/src/vespa/slobrok/server/remote_check.cpp b/slobrok/src/vespa/slobrok/server/remote_check.cpp index 157b959dbfe..00f0a4d3d7f 100644 --- a/slobrok/src/vespa/slobrok/server/remote_check.cpp +++ b/slobrok/src/vespa/slobrok/server/remote_check.cpp @@ -13,12 +13,9 @@ LOG_SETUP(".slobrok.server.remote_check"); namespace slobrok { -RemoteCheck::RemoteCheck(FNET_Scheduler *sched, - RpcServerMap& rpcsrvmap, - RpcServerManager& rpcsrvman, - ExchangeManager& exch) +RemoteCheck::RemoteCheck(FNET_Scheduler *sched, ExchangeManager& exch) : FNET_Task(sched), - _rpcsrvmap(rpcsrvmap), _rpcsrvmanager(rpcsrvman), _exchanger(exch) + _exchanger(exch) { double seconds = randomIn(15.3, 27.9); Schedule(seconds); diff --git a/slobrok/src/vespa/slobrok/server/remote_check.h b/slobrok/src/vespa/slobrok/server/remote_check.h index e0cf89c177d..11eb85401fe 100644 --- a/slobrok/src/vespa/slobrok/server/remote_check.h +++ b/slobrok/src/vespa/slobrok/server/remote_check.h @@ -20,17 +20,12 @@ class ExchangeManager; class RemoteCheck : public FNET_Task { private: - RpcServerMap &_rpcsrvmap; - RpcServerManager &_rpcsrvmanager; ExchangeManager &_exchanger; RemoteCheck(const RemoteCheck &); // Not used RemoteCheck &operator=(const RemoteCheck &); // Not used public: - explicit RemoteCheck(FNET_Scheduler *sched, - RpcServerMap& rpcsrvmap, - RpcServerManager& rpcsrvman, - ExchangeManager& exchanger); + explicit RemoteCheck(FNET_Scheduler *sched, ExchangeManager& exchanger); ~RemoteCheck(); private: void PerformTask() override; diff --git a/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp b/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp index 2e7c9683286..070d3b5c450 100644 --- a/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp +++ b/slobrok/src/vespa/slobrok/server/remote_slobrok.cpp @@ -18,7 +18,6 @@ namespace slobrok { RemoteSlobrok::RemoteSlobrok(const std::string &name, const std::string &spec, ExchangeManager &manager) : _exchanger(manager), - _rpcsrvmanager(manager.rpcServerManager()), _remote(nullptr), _serviceMapMirror(), _rpcserver(name, spec, *this), diff --git a/slobrok/src/vespa/slobrok/server/remote_slobrok.h b/slobrok/src/vespa/slobrok/server/remote_slobrok.h index d9086015f3a..316cd608468 100644 --- a/slobrok/src/vespa/slobrok/server/remote_slobrok.h +++ b/slobrok/src/vespa/slobrok/server/remote_slobrok.h @@ -12,7 +12,6 @@ namespace slobrok { //----------------------------------------------------------------------------- -class RpcServerManager; class ExchangeManager; //----------------------------------------------------------------------------- @@ -43,7 +42,6 @@ private: }; ExchangeManager &_exchanger; - RpcServerManager &_rpcsrvmanager; FRT_Target *_remote; ServiceMapMirror _serviceMapMirror; ManagedRpcServer _rpcserver; diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 23e70a9f3e1..dfab80799e0 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -109,7 +109,7 @@ SBEnv::SBEnv(const ConfigShim &shim, bool useNewConsensusLogic) _partnerList(), _me(createSpec(_configShim.portNumber())), _rpcHooks(*this), - _remotechecktask(std::make_unique<RemoteCheck>(getSupervisor()->GetScheduler(), _rpcsrvmap, _rpcsrvmanager, _exchanger)), + _remotechecktask(std::make_unique<RemoteCheck>(getSupervisor()->GetScheduler(), _exchanger)), _health(), _metrics(_rpcHooks, *_transport), _components(), @@ -118,8 +118,7 @@ SBEnv::SBEnv(const ConfigShim &shim, bool useNewConsensusLogic) return std::make_unique<RpcMappingMonitor>(*_supervisor, owner); }), _rpcsrvmanager(*this), - _exchanger(*this, _rpcsrvmap), - _rpcsrvmap() + _exchanger(*this) { srandom(time(nullptr) ^ getpid()); // note: feedback loop between these two: |