diff options
author | Håvard Pettersen <havardpe@yahooinc.com> | 2023-02-27 12:38:38 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@yahooinc.com> | 2023-02-27 12:49:01 +0000 |
commit | 466c5afc1e238ee09ce9d67b77a7118eca55acdc (patch) | |
tree | 37650cd4eb25a697a6290f026bc1da5227697978 /searchcore/src/apps | |
parent | 89bcb33930ad6f04e21a8699f7a7544b3cee9a5b (diff) |
avoid using fastos thread in searchcore
also remove some left-behind includes
Diffstat (limited to 'searchcore/src/apps')
-rw-r--r-- | searchcore/src/apps/proton/proton.cpp | 10 | ||||
-rw-r--r-- | searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp index 4d21143935b..281d7585274 100644 --- a/searchcore/src/apps/proton/proton.cpp +++ b/searchcore/src/apps/proton/proton.cpp @@ -10,7 +10,6 @@ #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/file.h> #include <filesystem> #include <iostream> @@ -45,7 +44,7 @@ private: static void setupSignals(); static void setup_fadvise(); Params parseParams(int argc, char **argv); - void startAndRun(FastOS_ThreadPool & threadPool, FNET_Transport & transport, int argc, char **argv); + void startAndRun(FNET_Transport & transport, int argc, char **argv); public: int main(int argc, char **argv); }; @@ -222,7 +221,7 @@ private: } void -App::startAndRun(FastOS_ThreadPool & threadPool, FNET_Transport & transport, int argc, char **argv) { +App::startAndRun(FNET_Transport & transport, int argc, char **argv) { Params params = parseParams(argc, argv); LOG(debug, "identity: '%s'", params.identity.c_str()); LOG(debug, "serviceidentity: '%s'", params.serviceidentity.c_str()); @@ -231,7 +230,7 @@ App::startAndRun(FastOS_ThreadPool & threadPool, FNET_Transport & transport, int config::ConfigServerSpec configServerSpec(transport); config::ConfigUri identityUri(params.identity, std::make_shared<config::ConfigContext>(configServerSpec)); - auto protonUP = std::make_unique<proton::Proton>(threadPool, transport, identityUri, + auto protonUP = std::make_unique<proton::Proton>(transport, identityUri, (argc > 0) ? argv[0] : "proton", subscribeTimeout); proton::Proton & proton = *protonUP; proton::BootstrapConfig::SP configSnapshot = proton.init(); @@ -283,9 +282,8 @@ App::main(int argc, char **argv) try { setupSignals(); setup_fadvise(); - FastOS_ThreadPool threadPool; Transport transport(buildTransportConfig()); - startAndRun(threadPool, transport.transport(), argc, argv); + startAndRun(transport.transport(), argc, argv); } catch (const vespalib::InvalidCommandLineArgumentsException &e) { LOG(warning, "Invalid commandline arguments: '%s'", e.what()); return 1; diff --git a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp index d69c978729d..50b5dadddbc 100644 --- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp +++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp @@ -19,7 +19,6 @@ #include <vespa/vespalib/util/signalhandler.h> #include <iostream> #include <thread> -#include <vespa/fastos/thread.h> #include <vespa/log/log.h> LOG_SETUP("vespa-transactionlog-inspect"); |