diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-24 20:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 20:31:12 +0100 |
| commit | cceca8e48b0c98a0faa93eee742f43a974d0afc3 (patch) | |
| tree | 0c1411256709620c9dc4952dfa482384a07d3fc9 /slobrok | |
| parent | 76d074a593d2fc98a4a459ed1665b2849121f12e (diff) | |
Revert "- Create the common transport and threadpool in the main loop."
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, 4 insertions, 7 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 13db95eb35c..0f691e1c168 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,11 +28,8 @@ struct Server : FRT_Invokable { last_conn->AddRef(); } } - Server(fnet::TimeTools::SP time_tools) - : frt(fnet::TransportConfig().time_tools(time_tools)), - names(), - inject_fail_cnt(0), - last_conn(nullptr) + Server(fnet::TimeTools::SP time_tools) : frt(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); @@ -106,7 +103,7 @@ struct RpcMappingMonitorTest : public ::testing::Test { ServiceMapping baz_b; RpcMappingMonitorTest() : debugger(), - my_frt(fnet::TransportConfig().time_tools(debugger.time_tools())), + my_frt(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 de9e5a0025f..84bf212abb3 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>(fnet::TransportConfig().drop_empty_buffers(true))), + : _transport(std::make_unique<FNET_Transport>(TransportConfig().drop_empty_buffers(true))), _supervisor(std::make_unique<FRT_Supervisor>(_transport.get())), _configShim(shim), _configurator(shim.factory().create(*this)), |