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 /storage/src | |
parent | 890e0ac9e795ca1c95e459f98a54593ac151051c (diff) |
untangle fnet from fastos
Diffstat (limited to 'storage/src')
3 files changed, 2 insertions, 7 deletions
diff --git a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp index e940dc71722..907918d97dc 100644 --- a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp +++ b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp @@ -66,8 +66,7 @@ SharedRpcResources::SharedRpcResources(const config::ConfigUri& config_uri, int rpc_server_port, size_t rpc_thread_pool_size, size_t rpc_events_before_wakeup) - : _thread_pool(std::make_unique<FastOS_ThreadPool>()), - _transport(std::make_unique<FNET_Transport>(fnet::TransportConfig(rpc_thread_pool_size). + : _transport(std::make_unique<FNET_Transport>(fnet::TransportConfig(rpc_thread_pool_size). events_before_wakeup(rpc_events_before_wakeup))), _orb(std::make_unique<FRT_Supervisor>(_transport.get())), _slobrok_register(std::make_unique<slobrok::api::RegisterAPI>(*_orb, slobrok::ConfiguratorFactory(config_uri))), @@ -92,7 +91,7 @@ void SharedRpcResources::start_server_and_register_slobrok(vespalib::stringref m if (!_orb->Listen(_rpc_server_port)) { throw IllegalStateException(fmt("Failed to listen to RPC port %d", _rpc_server_port), VESPA_STRLOC); } - _transport->Start(_thread_pool.get()); + _transport->Start(); _slobrok_register->registerName(my_handle); wait_until_slobrok_is_ready(); _handle = my_handle; diff --git a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.h b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.h index a30fcdc4ea7..953492089c1 100644 --- a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.h +++ b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.h @@ -6,7 +6,6 @@ #include <vespa/vespalib/stllike/string.h> #include <memory> -class FastOS_ThreadPool; class FNET_Transport; class FRT_Supervisor; @@ -19,7 +18,6 @@ namespace storage::rpc { class SharedRpcResources { class RpcTargetFactoryImpl; - std::unique_ptr<FastOS_ThreadPool> _thread_pool; std::unique_ptr<FNET_Transport> _transport; std::unique_ptr<FRT_Supervisor> _orb; std::unique_ptr<slobrok::api::RegisterAPI> _slobrok_register; diff --git a/storage/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h b/storage/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h index 07b2dd78ed9..4319b4a0efe 100644 --- a/storage/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h +++ b/storage/src/vespa/storageframework/defaultimplementation/thread/threadpoolimpl.h @@ -4,8 +4,6 @@ #include <vespa/storageframework/generic/thread/threadpool.h> -class FastOS_ThreadPool; - namespace storage::framework { struct Clock; } |