diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-10 17:46:38 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-10 17:46:38 +0000 |
commit | b686272de1bc25f6af8a094d7acff2c32fc51cbd (patch) | |
tree | fccc3513ef276b4dede6ae1b305f3a0ecb1560df /config | |
parent | 4412aace869986be3a1060f78f367841353d3384 (diff) |
Simplify by not caching a member
Diffstat (limited to 'config')
-rw-r--r-- | config/src/apps/vespa-ping-configproxy/pingproxy.cpp | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/config/src/apps/vespa-ping-configproxy/pingproxy.cpp b/config/src/apps/vespa-ping-configproxy/pingproxy.cpp index d681473ce34..432fe8c1afb 100644 --- a/config/src/apps/vespa-ping-configproxy/pingproxy.cpp +++ b/config/src/apps/vespa-ping-configproxy/pingproxy.cpp @@ -13,14 +13,13 @@ class PingProxy : public FastOS_Application { private: std::unique_ptr<fnet::frt::StandaloneFRT> _server; - FRT_Supervisor *_supervisor; FRT_Target *_target; PingProxy(const PingProxy &); PingProxy &operator=(const PingProxy &); public: - PingProxy() : _server(), _supervisor(nullptr), _target(nullptr) {} + PingProxy() : _server(), _target(nullptr) {} virtual ~PingProxy(); int usage(); void initRPC(const char *spec); @@ -31,7 +30,7 @@ public: PingProxy::~PingProxy() { - LOG_ASSERT(_supervisor == nullptr); + LOG_ASSERT(!_server); LOG_ASSERT(_target == nullptr); } @@ -50,8 +49,7 @@ void PingProxy::initRPC(const char *spec) { _server = std::make_unique<fnet::frt::StandaloneFRT>(); - _supervisor = &_server->supervisor(); - _target = _supervisor->GetTarget(spec); + _target = _server->supervisor().GetTarget(spec); } @@ -62,10 +60,7 @@ PingProxy::finiRPC() _target->SubRef(); _target = nullptr; } - if (_server) { - _server.reset(); - _supervisor = nullptr; - } + _server.reset(); } @@ -123,7 +118,7 @@ PingProxy::Main() } initRPC(spec); - FRT_RPCRequest *req = _supervisor->AllocRPCRequest(); + FRT_RPCRequest *req = _server->supervisor().AllocRPCRequest(); req->SetMethodName("ping"); |