diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-01 15:32:15 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-01 18:03:25 +0200 |
commit | 61a4ea34c2ddd3b618249b6f6eb402069e40bccb (patch) | |
tree | 6d6e8d55bfd574a0d2d039a07099774d2545f32e /config | |
parent | 54581b5ecd98230dc90fe787f1f02a33ebffbff6 (diff) |
Removed frt.h from header files to reduce include volume.
Diffstat (limited to 'config')
-rw-r--r-- | config/src/apps/configproxy-cmd/proxycmd.cpp | 6 | ||||
-rw-r--r-- | config/src/apps/configproxy-cmd/proxycmd.h | 10 | ||||
-rw-r--r-- | config/src/vespa/config/file_acquirer/file_acquirer.cpp | 14 | ||||
-rw-r--r-- | config/src/vespa/config/file_acquirer/file_acquirer.h | 5 | ||||
-rw-r--r-- | config/src/vespa/config/frt/frtconnection.cpp | 10 | ||||
-rw-r--r-- | config/src/vespa/config/frt/frtconnection.h | 9 | ||||
-rw-r--r-- | config/src/vespa/config/frt/frtconnectionpool.cpp | 17 | ||||
-rw-r--r-- | config/src/vespa/config/frt/frtconnectionpool.h | 6 | ||||
-rw-r--r-- | config/src/vespa/config/frt/frtsource.h | 3 |
9 files changed, 52 insertions, 28 deletions
diff --git a/config/src/apps/configproxy-cmd/proxycmd.cpp b/config/src/apps/configproxy-cmd/proxycmd.cpp index 794c005f485..df37333f514 100644 --- a/config/src/apps/configproxy-cmd/proxycmd.cpp +++ b/config/src/apps/configproxy-cmd/proxycmd.cpp @@ -1,8 +1,12 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "proxycmd.h" -#include <iostream> #include <vespa/vespalib/util/stringfmt.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> + +#include <iostream> Flags::Flags(const Flags &) = default; Flags & Flags::operator=(const Flags &) = default; diff --git a/config/src/apps/configproxy-cmd/proxycmd.h b/config/src/apps/configproxy-cmd/proxycmd.h index a0ef02edaae..57b4d83fd42 100644 --- a/config/src/apps/configproxy-cmd/proxycmd.h +++ b/config/src/apps/configproxy-cmd/proxycmd.h @@ -1,7 +1,13 @@ // 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/frt/frt.h> +#include <vespa/vespalib/stllike/string.h> +#include <vector> + +class FRT_Supervisor; +class FRT_Target; +class FRT_RPCRequest; +class FRT_Values; struct Flags { vespalib::string method; @@ -30,9 +36,7 @@ private: void autoPrint(); public: ProxyCmd(const Flags& flags); - virtual ~ProxyCmd(); - int action(); }; diff --git a/config/src/vespa/config/file_acquirer/file_acquirer.cpp b/config/src/vespa/config/file_acquirer/file_acquirer.cpp index 147da7caaf9..37d66c11453 100644 --- a/config/src/vespa/config/file_acquirer/file_acquirer.cpp +++ b/config/src/vespa/config/file_acquirer/file_acquirer.cpp @@ -1,24 +1,28 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "file_acquirer.h" +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> + #include <vespa/log/log.h> LOG_SETUP(".config.file_acquirer"); namespace config { RpcFileAcquirer::RpcFileAcquirer(const vespalib::string &spec) - : _orb(), + : _orb(std::make_unique<FRT_Supervisor>()), _spec(spec) { - _orb.Start(); + _orb->Start(); } vespalib::string RpcFileAcquirer::wait_for(const vespalib::string &file_ref, double timeout_s) { vespalib::string path; - FRT_Target *target = _orb.GetTarget(_spec.c_str()); - FRT_RPCRequest *req = _orb.AllocRPCRequest(); + FRT_Target *target = _orb->GetTarget(_spec.c_str()); + FRT_RPCRequest *req = _orb->AllocRPCRequest(); req->SetMethodName("waitFor"); req->GetParams()->AddString(file_ref.data(), file_ref.size()); target->InvokeSync(req, timeout_s); @@ -35,7 +39,7 @@ RpcFileAcquirer::wait_for(const vespalib::string &file_ref, double timeout_s) RpcFileAcquirer::~RpcFileAcquirer() { - _orb.ShutDown(true); + _orb->ShutDown(true); } } // namespace config diff --git a/config/src/vespa/config/file_acquirer/file_acquirer.h b/config/src/vespa/config/file_acquirer/file_acquirer.h index ff090c9e7c0..3623fd5775d 100644 --- a/config/src/vespa/config/file_acquirer/file_acquirer.h +++ b/config/src/vespa/config/file_acquirer/file_acquirer.h @@ -2,7 +2,8 @@ #pragma once #include <vespa/vespalib/stllike/string.h> -#include <vespa/fnet/frt/frt.h> + +class FRT_Supervisor; namespace config { @@ -22,7 +23,7 @@ struct FileAcquirer { class RpcFileAcquirer : public FileAcquirer { private: - FRT_Supervisor _orb; + std::unique_ptr<FRT_Supervisor> _orb; vespalib::string _spec; public: RpcFileAcquirer(const vespalib::string &spec); diff --git a/config/src/vespa/config/frt/frtconnection.cpp b/config/src/vespa/config/frt/frtconnection.cpp index 40e59000aef..301655d3fed 100644 --- a/config/src/vespa/config/frt/frtconnection.cpp +++ b/config/src/vespa/config/frt/frtconnection.cpp @@ -2,7 +2,10 @@ #include "frtconnection.h" #include <vespa/vespalib/util/atomic.h> #include <vespa/config/common/errorcode.h> -#include <time.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> + #include <vespa/log/log.h> LOG_SETUP(".config.frt.frtconnection"); @@ -114,4 +117,9 @@ void FRTConnection::calculateSuspension(ErrorType type) } } +FRT_RPCRequest * +FRTConnection::allocRPCRequest() { + return _supervisor.AllocRPCRequest(); +} + } diff --git a/config/src/vespa/config/frt/frtconnection.h b/config/src/vespa/config/frt/frtconnection.h index d0a8163413c..8eb963dc878 100644 --- a/config/src/vespa/config/frt/frtconnection.h +++ b/config/src/vespa/config/frt/frtconnection.h @@ -2,12 +2,14 @@ #pragma once #include <string> -#include <vespa/fnet/frt/frt.h> #include <vespa/vespalib/util/sync.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/config/common/timingvalues.h> #include "connection.h" +class FRT_Supervisor; +class FRT_Target; + namespace config { class FRTConnection : public Connection { @@ -35,10 +37,7 @@ public: FRTConnection(const vespalib::string & address, FRT_Supervisor & supervisor, const TimingValues & timingValues); ~FRTConnection(); - FRT_RPCRequest * allocRPCRequest() override { - return _supervisor.AllocRPCRequest(); - } - + FRT_RPCRequest * allocRPCRequest() override; void invoke(FRT_RPCRequest * req, double timeout, FRT_IRequestWait * waiter) override; const vespalib::string & getAddress() const override { return _address; } int64_t getSuspendedUntil() { return _suspendedUntil; } diff --git a/config/src/vespa/config/frt/frtconnectionpool.cpp b/config/src/vespa/config/frt/frtconnectionpool.cpp index 70225b9dd04..4f433667afc 100644 --- a/config/src/vespa/config/frt/frtconnectionpool.cpp +++ b/config/src/vespa/config/frt/frtconnectionpool.cpp @@ -2,7 +2,8 @@ #include "frtconnectionpool.h" #include <vespa/vespalib/util/host_name.h> -#include <cstdlib> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/transport.h> namespace config { @@ -26,27 +27,27 @@ FRTConnectionPool::FRTConnectionKey::operator==(const FRTConnectionKey& right) c } FRTConnectionPool::FRTConnectionPool(const ServerSpec & spec, const TimingValues & timingValues) - : _supervisor(), + : _supervisor(std::make_unique<FRT_Supervisor>()), _selectIdx(0), _hostname("") { for (size_t i(0); i < spec.numHosts(); i++) { FRTConnectionKey key(i, spec.getHost(i)); - _connections[key].reset(new FRTConnection(spec.getHost(i), _supervisor, timingValues)); + _connections[key].reset(new FRTConnection(spec.getHost(i), *_supervisor, timingValues)); } setHostname(); - _supervisor.Start(); + _supervisor->Start(); } FRTConnectionPool::~FRTConnectionPool() { - _supervisor.ShutDown(true); + _supervisor->ShutDown(true); } void FRTConnectionPool::syncTransport() { - _supervisor.GetTransport()->sync(); + _supervisor->GetTransport()->sync(); } Connection * @@ -147,5 +148,9 @@ FRTConnectionPool::setHostname() _hostname = vespalib::HostName::get(); } +FNET_Scheduler * +FRTConnectionPool::getScheduler() { + return _supervisor->GetScheduler(); +} } diff --git a/config/src/vespa/config/frt/frtconnectionpool.h b/config/src/vespa/config/frt/frtconnectionpool.h index d5af64bba93..ba09b9319b6 100644 --- a/config/src/vespa/config/frt/frtconnectionpool.h +++ b/config/src/vespa/config/frt/frtconnectionpool.h @@ -4,10 +4,10 @@ #include "frtconnection.h" #include "connectionfactory.h" #include <vespa/config/subscription/sourcespec.h> -#include <vespa/fnet/frt/frt.h> #include <vector> #include <string> #include <map> + namespace config { class FRTConnectionPool : public ConnectionFactory { @@ -32,7 +32,7 @@ private: int operator==(const FRTConnectionKey& right) const; }; - FRT_Supervisor _supervisor; + std::unique_ptr<FRT_Supervisor> _supervisor; int _selectIdx; vespalib::string _hostname; typedef std::map<FRTConnectionKey, FRTConnection::SP> ConnectionMap; @@ -56,7 +56,7 @@ public: */ void setHostname(const vespalib::string & hostname) { _hostname = hostname; } - FNET_Scheduler * getScheduler() override { return _supervisor.GetScheduler(); } + FNET_Scheduler * getScheduler() override; /** * Gets the hostname. diff --git a/config/src/vespa/config/frt/frtsource.h b/config/src/vespa/config/frt/frtsource.h index 653d182707b..fbcc55e09fe 100644 --- a/config/src/vespa/config/frt/frtsource.h +++ b/config/src/vespa/config/frt/frtsource.h @@ -1,15 +1,14 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once - #include "connectionfactory.h" #include "frtconfigagent.h" #include "frtconfigrequestfactory.h" #include <vespa/config/common/configkey.h> #include <vespa/config/common/configrequest.h> #include <vespa/config/common/source.h> +#include <vespa/fnet/frt/invoker.h> -#include <vespa/fnet/frt/frt.h> #include <vespa/vespalib/util/sync.h> namespace config { |