diff options
Diffstat (limited to 'searchcore/src/apps/proton/proton.cpp')
| -rw-r--r-- | searchcore/src/apps/proton/proton.cpp | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp index 3a31f941506..61536f924a5 100644 --- a/searchcore/src/apps/proton/proton.cpp +++ b/searchcore/src/apps/proton/proton.cpp @@ -5,13 +5,9 @@ #include <vespa/metrics/metricmanager.h> #include <vespa/vespalib/util/signalhandler.h> #include <vespa/vespalib/util/programoptions.h> -#include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/config/common/exceptions.h> -#include <vespa/config/common/configcontext.h> -#include <vespa/fnet/transport.h> -#include <vespa/fastos/thread.h> #include <vespa/fastos/app.h> #include <iostream> #include <thread> @@ -177,12 +173,6 @@ ExitOnSignal::operator()() } } -fnet::TransportConfig -buildTransportConfig() { - uint32_t numProcs = std::thread::hardware_concurrency(); - return fnet::TransportConfig(std::max(1u, std::min(4u, numProcs/8))); -} - } int @@ -196,14 +186,8 @@ App::Main() LOG(debug, "serviceidentity: '%s'", params.serviceidentity.c_str()); LOG(debug, "subscribeTimeout: '%" PRIu64 "'", params.subscribeTimeout); std::chrono::milliseconds subscribeTimeout(params.subscribeTimeout); - FastOS_ThreadPool threadPool(128_Ki); - - FNET_Transport transport(buildTransportConfig()); - transport.Start(&threadPool); - config::ConfigServerSpec configServerSpec(transport); - config::ConfigUri identityUri(params.identity, std::make_shared<config::ConfigContext>(configServerSpec)); - protonUP = std::make_unique<proton::Proton>(threadPool, transport, identityUri, - _argc > 0 ? _argv[0] : "proton", subscribeTimeout); + config::ConfigUri identityUri(params.identity); + protonUP = std::make_unique<proton::Proton>(identityUri, _argc > 0 ? _argv[0] : "proton", subscribeTimeout); proton::Proton & proton = *protonUP; proton::BootstrapConfig::SP configSnapshot = proton.init(); if (proton.hasAbortedInit()) { @@ -244,7 +228,6 @@ App::Main() EV_STOPPING("servicelayer", "clean shutdown"); } protonUP.reset(); - transport.ShutDown(true); EV_STOPPING("proton", "clean shutdown"); } } catch (const vespalib::InvalidCommandLineArgumentsException &e) { |