aboutsummaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/tests/transactionlog/translogclient_test.cpp6
-rw-r--r--searchlib/src/tests/transactionlogstress/translogstress.cpp3
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/translogclient.h1
3 files changed, 2 insertions, 8 deletions
diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp
index a1a42b592b2..cdf157b3fa0 100644
--- a/searchlib/src/tests/transactionlog/translogclient_test.cpp
+++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp
@@ -480,16 +480,14 @@ getMaxSessionRunTime(TransLogServer &tls, const vespalib::string &domain)
}
struct TLS {
- FastOS_ThreadPool threadPool;
FNET_Transport transport;
TransLogServer tls;
TLS(const vespalib::string &name, int listenPort, const vespalib::string &baseDir,
const common::FileHeaderContext &fileHeaderContext, const DomainConfig & cfg, size_t maxThreads = 4)
- : threadPool(),
- transport(),
+ : transport(),
tls(transport, name, listenPort, baseDir, fileHeaderContext, cfg, maxThreads)
{
- transport.Start(&threadPool);
+ transport.Start();
}
~TLS() {
transport.ShutDown(true);
diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp
index f0ca11a2cc8..14a66c71c18 100644
--- a/searchlib/src/tests/transactionlogstress/translogstress.cpp
+++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp
@@ -706,7 +706,6 @@ TransLogStress::main(int argc, char **argv)
}
// start transaction log server
- FastOS_ThreadPool threadPool;
FNET_Transport transport;
DummyFileHeaderContext fileHeaderContext;
TransLogServer tls(transport, "server", 17897, ".", fileHeaderContext, DomainConfig().setPartSizeLimit(_cfg.domainPartSize));
@@ -759,8 +758,6 @@ TransLogStress::main(int argc, char **argv)
std::cout << "</visitor>" << std::endl;
}
- threadPool.Close();
-
return 0;
}
diff --git a/searchlib/src/vespa/searchlib/transactionlog/translogclient.h b/searchlib/src/vespa/searchlib/transactionlog/translogclient.h
index c3dcecf93b3..72a55f6ae77 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/translogclient.h
+++ b/searchlib/src/vespa/searchlib/transactionlog/translogclient.h
@@ -12,7 +12,6 @@
class FNET_Transport;
class FRT_Supervisor;
class FRT_Target;
-class FastOS_ThreadPool;
namespace vespalib { class ThreadStackExecutorBase; }
namespace search::transactionlog::client {