Merge pull request #15524 from vespa-engine/balder/added-throughput-mode

Balder/added throughput mode

2 files changed, 22 insertions, 20 deletions

diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
index 5872706c443..893b8d1d2ca 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp
@@ -14,6 +14,7 @@
 #include <vespa/vespalib/component/vtag.h>
 #include <vespa/vespalib/stllike/asciistream.h>
 #include <vespa/vespalib/util/stringfmt.h>
+#include <vespa/vespalib/util/threadstackexecutor.h>
 #include <vespa/fnet/scheduler.h>
 #include <vespa/fnet/transport.h>
 #include <vespa/fnet/frt/supervisor.h>
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.h b/messagebus/src/vespa/messagebus/network/rpcnetwork.h
index 2780c3e8770..d701358fc84 100644
--- a/messagebus/src/vespa/messagebus/network/rpcnetwork.h
+++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.h
@@ -15,6 +15,7 @@
 #include <vespa/fnet/frt/invokable.h>
 
 class FNET_Transport;
+class FastOS_ThreadPool;
 
 namespace slobrok {
     namespace api { class RegisterAPI; }
@@ -52,26 +53,26 @@ private:
 
     using SendAdapterMap = std::map<vespalib::Version, RPCSendAdapter*>;
 
-    INetworkOwner                                  *_owner;
-    Identity                                        _ident;
-    std::unique_ptr<FastOS_ThreadPool>              _threadPool;
-    std::unique_ptr<FNET_Transport>                 _transport;
-    std::unique_ptr<FRT_Supervisor>                 _orb;
-    FNET_Scheduler                                 &_scheduler;
-    std::unique_ptr<slobrok::ConfiguratorFactory>   _slobrokCfgFactory;
-    std::unique_ptr<slobrok::api::IMirrorAPI>       _mirror;
-    std::unique_ptr<slobrok::api::RegisterAPI>      _regAPI;
-    int                                             _requestedPort;
-    std::unique_ptr<RPCTargetPool>                  _targetPool;
-    std::unique_ptr<FNET_Task>                      _targetPoolTask;
-    std::unique_ptr<RPCServicePool>                 _servicePool;
-    std::unique_ptr<vespalib::ThreadStackExecutor>  _executor;
-    std::unique_ptr<RPCSendAdapter>                 _sendV1;
-    std::unique_ptr<RPCSendAdapter>                 _sendV2;
-    SendAdapterMap                                  _sendAdapters;
-    CompressionConfig                               _compressionConfig;
-    bool                                            _allowDispatchForEncode;
-    bool                                            _allowDispatchForDecode;
+    INetworkOwner                                     *_owner;
+    Identity                                           _ident;
+    std::unique_ptr<FastOS_ThreadPool>                 _threadPool;
+    std::unique_ptr<FNET_Transport>                    _transport;
+    std::unique_ptr<FRT_Supervisor>                    _orb;
+    FNET_Scheduler                                    &_scheduler;
+    std::unique_ptr<slobrok::ConfiguratorFactory>      _slobrokCfgFactory;
+    std::unique_ptr<slobrok::api::IMirrorAPI>          _mirror;
+    std::unique_ptr<slobrok::api::RegisterAPI>         _regAPI;
+    int                                                _requestedPort;
+    std::unique_ptr<RPCTargetPool>                     _targetPool;
+    std::unique_ptr<FNET_Task>                         _targetPoolTask;
+    std::unique_ptr<RPCServicePool>                    _servicePool;
+    std::unique_ptr<vespalib::SyncableThreadExecutor>  _executor;
+    std::unique_ptr<RPCSendAdapter>                    _sendV1;
+    std::unique_ptr<RPCSendAdapter>                    _sendV2;
+    SendAdapterMap                                     _sendAdapters;
+    CompressionConfig                                  _compressionConfig;
+    bool                                               _allowDispatchForEncode;
+    bool                                               _allowDispatchForDecode;
 
 
     /**