diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-24 12:50:31 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-24 12:50:31 +0000 |
commit | 9d8de3b985984987a4eae67e5d6d3a3fbdfc7efa (patch) | |
tree | 70eeb1abeaa1fd22dbfd8ed5f07409f643cc6a9d /slobrok | |
parent | 4ed0d2b6f00c82bc3ba8a3290576a7bedfdd1895 (diff) |
- Create the common transport and threadpool in the main loop.
- Also use the common transport for config subscriptions.
- Put The TransportConfig in the fnet namespace.
Diffstat (limited to 'slobrok')
-rw-r--r-- | slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp | 9 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/sbenv.cpp | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp b/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp index 0f691e1c168..13db95eb35c 100644 --- a/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp +++ b/slobrok/src/tests/rpc_mapping_monitor/rpc_mapping_monitor_test.cpp @@ -28,8 +28,11 @@ struct Server : FRT_Invokable { last_conn->AddRef(); } } - Server(fnet::TimeTools::SP time_tools) : frt(TransportConfig().time_tools(time_tools)), names(), - inject_fail_cnt(0), last_conn(nullptr) + Server(fnet::TimeTools::SP time_tools) + : frt(fnet::TransportConfig().time_tools(time_tools)), + names(), + inject_fail_cnt(0), + last_conn(nullptr) { FRT_ReflectionBuilder rb(&frt.supervisor()); rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", FRT_METHOD(Server::rpc_listNamesServed), this); @@ -103,7 +106,7 @@ struct RpcMappingMonitorTest : public ::testing::Test { ServiceMapping baz_b; RpcMappingMonitorTest() : debugger(), - my_frt(TransportConfig().time_tools(debugger.time_tools())), + my_frt(fnet::TransportConfig().time_tools(debugger.time_tools())), a(debugger.time_tools()), b(debugger.time_tools()), hist(), diff --git a/slobrok/src/vespa/slobrok/server/sbenv.cpp b/slobrok/src/vespa/slobrok/server/sbenv.cpp index 84bf212abb3..de9e5a0025f 100644 --- a/slobrok/src/vespa/slobrok/server/sbenv.cpp +++ b/slobrok/src/vespa/slobrok/server/sbenv.cpp @@ -98,7 +98,7 @@ ConfigTask::PerformTask() } // namespace slobrok::<unnamed> SBEnv::SBEnv(const ConfigShim &shim) - : _transport(std::make_unique<FNET_Transport>(TransportConfig().drop_empty_buffers(true))), + : _transport(std::make_unique<FNET_Transport>(fnet::TransportConfig().drop_empty_buffers(true))), _supervisor(std::make_unique<FRT_Supervisor>(_transport.get())), _configShim(shim), _configurator(shim.factory().create(*this)), |