untangle fnet from fastos

2 files changed, 4 insertions, 6 deletions

diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp
index 2c47b5162ca..4d21143935b 100644
--- a/searchcore/src/apps/proton/proton.cpp
+++ b/searchcore/src/apps/proton/proton.cpp
@@ -206,10 +206,10 @@ buildTransportConfig() {
 
 class Transport {
 public:
-    Transport(const fnet::TransportConfig & config, FastOS_ThreadPool & threadPool)
+    Transport(const fnet::TransportConfig & config)
         : _transport(config)
     {
-        _transport.Start(&threadPool);
+        _transport.Start();
     }
     ~Transport() {
         _transport.ShutDown(true);
@@ -284,7 +284,7 @@ App::main(int argc, char **argv)
         setupSignals();
         setup_fadvise();
         FastOS_ThreadPool threadPool;
-        Transport transport(buildTransportConfig(), threadPool);
+        Transport transport(buildTransportConfig());
         startAndRun(threadPool, transport.transport(), argc, argv);
     } catch (const vespalib::InvalidCommandLineArgumentsException &e) {
         LOG(warning, "Invalid commandline arguments: '%s'", e.what());
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 76fc875b209..d69c978729d 100644
--- a/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
+++ b/searchcore/src/apps/vespa-transactionlog-inspect/vespa-transactionlog-inspect.cpp
@@ -379,7 +379,6 @@ class BaseUtility : public Utility
 protected:
     const BaseOptions     &_bopts;
     DummyFileHeaderContext _fileHeader;
-    FastOS_ThreadPool      _threadPool;
     FNET_Transport         _transport;
     TransLogServer         _server;
     client::TransLogClient _client;
@@ -388,12 +387,11 @@ public:
     BaseUtility(const BaseOptions &bopts)
         : _bopts(bopts),
           _fileHeader(),
-          _threadPool(),
           _transport(),
           _server(_transport, _bopts.tlsName, _bopts.listenPort, _bopts.tlsDir, _fileHeader),
           _client(_transport, vespalib::make_string("tcp/localhost:%d", _bopts.listenPort))
     {
-        _transport.Start(&_threadPool);
+        _transport.Start();
     }
     ~BaseUtility() override {
         _transport.ShutDown(true);