Revert "Revert "- Create the common transport and threadpool in the main loop.""

6 files changed, 13 insertions, 14 deletions

diff --git a/fnet/src/tests/connect/connect_test.cpp b/fnet/src/tests/connect/connect_test.cpp
index 308981542db..2edb2e694ff 100644
--- a/fnet/src/tests/connect/connect_test.cpp
+++ b/fnet/src/tests/connect/connect_test.cpp
@@ -98,13 +98,13 @@ struct TransportFixture : FNET_IPacketHandler, FNET_IConnectionCleanupHandler {
         transport.Start(&pool);
     }
     TransportFixture(AsyncResolver::HostResolver::SP host_resolver)
-        : streamer(nullptr), pool(128_Ki), transport(TransportConfig().resolver(make_resolver(std::move(host_resolver)))),
+        : streamer(nullptr), pool(128_Ki), transport(fnet::TransportConfig().resolver(make_resolver(std::move(host_resolver)))),
           conn_lost(), conn_deleted()
     {
         transport.Start(&pool);
     }
     TransportFixture(CryptoEngine::SP crypto)
-        : streamer(nullptr), pool(128_Ki), transport(TransportConfig().crypto(std::move(crypto))),
+        : streamer(nullptr), pool(128_Ki), transport(fnet::TransportConfig().crypto(std::move(crypto))),
           conn_lost(), conn_deleted()
     {
         transport.Start(&pool);
diff --git a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
index 0fd5029c9b9..b027b80f8ab 100644
--- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
+++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp
@@ -19,7 +19,7 @@ struct Rpc : FRT_Invokable {
     FNET_Transport    transport;
     FRT_Supervisor    orb;
     Rpc(CryptoEngine::SP crypto, size_t num_threads, bool drop_empty)
-        : thread_pool(128_Ki), transport(TransportConfig(num_threads).crypto(std::move(crypto)).drop_empty_buffers(drop_empty)), orb(&transport) {}
+        : thread_pool(128_Ki), transport(fnet::TransportConfig(num_threads).crypto(std::move(crypto)).drop_empty_buffers(drop_empty)), orb(&transport) {}
     void start() {
         ASSERT_TRUE(transport.Start(&thread_pool));
     }
diff --git a/fnet/src/tests/transport_debugger/transport_debugger_test.cpp b/fnet/src/tests/transport_debugger/transport_debugger_test.cpp
index 044f9da5394..a363b1df4c2 100644
--- a/fnet/src/tests/transport_debugger/transport_debugger_test.cpp
+++ b/fnet/src/tests/transport_debugger/transport_debugger_test.cpp
@@ -18,7 +18,7 @@ vespalib::CryptoEngine::SP tls_crypto = std::make_shared<vespalib::TlsCryptoEngi
 struct Service : FRT_Invokable {
     fnet::frt::StandaloneFRT frt;
     Service(fnet::TimeTools::SP time_tools)
-      : frt(TransportConfig(4).crypto(tls_crypto).time_tools(time_tools))
+      : frt(fnet::TransportConfig(4).crypto(tls_crypto).time_tools(time_tools))
     {
         init_rpc();
         ASSERT_TRUE(frt.supervisor().Listen(0));
diff --git a/fnet/src/vespa/fnet/frt/supervisor.h b/fnet/src/vespa/fnet/frt/supervisor.h
index 0207adc8adb..a97385adfed 100644
--- a/fnet/src/vespa/fnet/frt/supervisor.h
+++ b/fnet/src/vespa/fnet/frt/supervisor.h
@@ -10,7 +10,7 @@
 #include <vespa/fnet/connection.h>
 #include <vespa/fnet/simplepacketstreamer.h>
 
-class TransportConfig;
+namespace fnet { class TransportConfig; }
 class FNET_Transport;
 class FRT_Target;
 class FastOS_ThreadPool;
diff --git a/fnet/src/vespa/fnet/transport.cpp b/fnet/src/vespa/fnet/transport.cpp
index a695b95bbac..b4e3443b886 100644
--- a/fnet/src/vespa/fnet/transport.cpp
+++ b/fnet/src/vespa/fnet/transport.cpp
@@ -98,8 +98,6 @@ TimeTools::make_debug(vespalib::duration event_timeout,
     return std::make_shared<DebugTimeTools>(event_timeout, std::move(current_time));
 }
 
-} // fnet
-
 TransportConfig::TransportConfig(int num_threads)
     : _config(),
       _resolver(),
@@ -125,7 +123,9 @@ TransportConfig::time_tools() const {
     return _time_tools ? _time_tools : std::make_shared<DefaultTimeTools>();
 }
 
-FNET_Transport::FNET_Transport(const TransportConfig &cfg)
+} // fnet
+
+FNET_Transport::FNET_Transport(const fnet::TransportConfig &cfg)
     : _async_resolver(cfg.resolver()),
       _crypto_engine(cfg.crypto()),
       _time_tools(cfg.time_tools()),
diff --git a/fnet/src/vespa/fnet/transport.h b/fnet/src/vespa/fnet/transport.h
index 1e8faad9c1d..c3101d37b18 100644
--- a/fnet/src/vespa/fnet/transport.h
+++ b/fnet/src/vespa/fnet/transport.h
@@ -4,8 +4,6 @@
 
 #include "context.h"
 #include "config.h"
-#include <memory>
-#include <vector>
 #include <vespa/vespalib/net/async_resolver.h>
 #include <vespa/vespalib/net/crypto_engine.h>
 #include <vespa/vespalib/util/time.h>
@@ -39,7 +37,6 @@ struct TimeTools {
                                     std::function<vespalib::steady_time()> current_time);
 };
 
-} // fnet
 
 class TransportConfig {
 public:
@@ -96,6 +93,8 @@ private:
     uint32_t                    _num_threads;
 };
 
+} // fnet
+
 /**
  * This class represents the transport layer and handles a collection
  * of transport threads. Note: remember to shut down your transport
@@ -124,12 +123,12 @@ public:
      * the current thread become the transport thread. Main may only
      * be called for single-threaded transports.
      **/
-    explicit FNET_Transport(const TransportConfig &config);
+    explicit FNET_Transport(const fnet::TransportConfig &config);
 
     explicit FNET_Transport(uint32_t num_threads)
-        : FNET_Transport(TransportConfig(num_threads)) {}
+        : FNET_Transport(fnet::TransportConfig(num_threads)) {}
     FNET_Transport()
-        : FNET_Transport(TransportConfig()) {}
+        : FNET_Transport(fnet::TransportConfig()) {}
     ~FNET_Transport();
 
     const FNET_Config & getConfig() const { return _config; }