diff options
author | Håvard Pettersen <havardpe@yahooinc.com> | 2023-02-22 12:54:31 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@yahooinc.com> | 2023-02-22 14:46:14 +0000 |
commit | b6073079e7d0d09fb7f13606d3fe3f1798337d66 (patch) | |
tree | 70998a611bdb7af626e8f480e34062db7783c2ea /messagebus | |
parent | 890e0ac9e795ca1c95e459f98a54593ac151051c (diff) |
untangle fnet from fastos
Diffstat (limited to 'messagebus')
-rw-r--r-- | messagebus/src/vespa/messagebus/network/rpcnetwork.cpp | 4 | ||||
-rw-r--r-- | messagebus/src/vespa/messagebus/network/rpcnetwork.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp index 030e3f956e1..3a13534220f 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp @@ -95,7 +95,6 @@ RPCNetwork::SendContext::handleVersion(const vespalib::Version *version) RPCNetwork::RPCNetwork(const RPCNetworkParams ¶ms) : _owner(nullptr), _ident(params.getIdentity()), - _threadPool(std::make_unique<FastOS_ThreadPool>()), _transport(std::make_unique<FNET_Transport>(toFNETConfig(params))), _orb(std::make_unique<FRT_Supervisor>(_transport.get())), _scheduler(*_transport->GetScheduler()), @@ -196,7 +195,7 @@ RPCNetwork::getSendAdapter(const vespalib::Version &version) bool RPCNetwork::start() { - if (!_transport->Start(_threadPool.get())) { + if (!_transport->Start()) { return false; } if (!_orb->Listen(_requestedPort)) { @@ -391,7 +390,6 @@ RPCNetwork::shutdown() // Unschedule any pending target pool flush task that may race with shutdown target flushing _scheduler.Kill(_targetPoolTask.get()); _transport->ShutDown(true); - _threadPool->Close(); } void diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.h b/messagebus/src/vespa/messagebus/network/rpcnetwork.h index 0d2435e5dcd..8e296981458 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetwork.h +++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.h @@ -16,7 +16,6 @@ #include <vespa/fnet/frt/invokable.h> class FNET_Transport; -class FastOS_ThreadPool; namespace slobrok { namespace api { class RegisterAPI; } @@ -56,7 +55,6 @@ private: INetworkOwner *_owner; Identity _ident; - std::unique_ptr<FastOS_ThreadPool> _threadPool; std::unique_ptr<FNET_Transport> _transport; std::unique_ptr<FRT_Supervisor> _orb; FNET_Scheduler &_scheduler; |