diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-24 20:32:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-24 20:32:13 +0100 |
| commit | 94719c46c713f986a650910715e5847f5defa407 (patch) | |
| tree | aceaca6f4e3b590f43facda5e6462a11263771fc /slobrok | |
| parent | a2815ee7b7680c0387fc6ee907dd9f000fa197d5 (diff) | |
Revert "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, 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)), |