diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-22 16:28:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-22 16:28:51 +0100 |
commit | 7f80d9bdc076912e493a895daba92b25c6b7ec0e (patch) | |
tree | d16ea5c4b71a8857a3ccc2d4da679156a9740ed2 /searchlib/src/tests/transactionlogstress | |
parent | f859f58e988c61b0c16f4ed4eb9aaa5daca1661d (diff) |
Revert "Revert "Use common tranport for TlsClient""
Diffstat (limited to 'searchlib/src/tests/transactionlogstress')
-rw-r--r-- | searchlib/src/tests/transactionlogstress/translogstress.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/searchlib/src/tests/transactionlogstress/translogstress.cpp b/searchlib/src/tests/transactionlogstress/translogstress.cpp index 3d8379adba2..de0e1b60ca0 100644 --- a/searchlib/src/tests/transactionlogstress/translogstress.cpp +++ b/searchlib/src/tests/transactionlogstress/translogstress.cpp @@ -207,16 +207,16 @@ private: bool addEntry(const Packet::Entry & e); public: - FeederThread(const std::string & tlsSpec, const std::string & domain, + FeederThread(FNET_Transport & transport, const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, uint32_t feedRate, size_t packetSize); ~FeederThread() override; void doRun() override; SerialNumRange getRange() const { return SerialNumRange(1, _lastCommited); } }; -FeederThread::FeederThread(const std::string & tlsSpec, const std::string & domain, +FeederThread::FeederThread(FNET_Transport & transport, const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, uint32_t feedRate, size_t packetSize) - : _tlsSpec(tlsSpec), _domain(domain), _client(tlsSpec), _session(), + : _tlsSpec(tlsSpec), _domain(domain), _client(transport, tlsSpec), _session(), _generator(generator), _feedRate(feedRate), _packet(packetSize), _current(1), _lastCommited(1), _timer() {} FeederThread::~FeederThread() = default; @@ -301,10 +301,10 @@ protected: bool _validate; public: - Agent(const std::string & tlsSpec, const std::string & domain, + Agent(FNET_Transport & transport, const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, const std::string & name, uint32_t id, bool validate) : client::Callback(), - _tlsSpec(tlsSpec), _domain(domain), _client(tlsSpec), + _tlsSpec(tlsSpec), _domain(domain), _client(transport, tlsSpec), _generator(generator), _name(name), _id(id), _validate(validate) {} ~Agent() override {} @@ -339,9 +339,9 @@ private: SerialNum getNext(); public: - VisitorAgent(const std::string & tlsSpec, const std::string & domain, + VisitorAgent(FNET_Transport & transport, const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, uint32_t id, bool validate) : - Agent(tlsSpec, domain, generator, "VisitorAgent", id, validate), + Agent(transport, tlsSpec, domain, generator, "VisitorAgent", id, validate), _visitor(), _from(0), _to(0), _next(0), _state(IDLE) {} ~VisitorAgent() override = default; void start(SerialNum from, SerialNum to); @@ -470,24 +470,23 @@ private: void makeRandomVisitorVector(); public: - ControllerThread(const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, + ControllerThread(FNET_Transport & transport, const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, uint32_t numVisitors, vespalib::duration visitorInterval, vespalib::duration pruneInterval); ~ControllerThread(); - uint32_t runningVisitors(); std::vector<std::shared_ptr<VisitorAgent> > & getVisitors() { return _visitors; } virtual void doRun() override; }; -ControllerThread::ControllerThread(const std::string & tlsSpec, const std::string & domain, +ControllerThread::ControllerThread(FNET_Transport & transport, const std::string & tlsSpec, const std::string & domain, const EntryGenerator & generator, uint32_t numVisitors, vespalib::duration visitorInterval, vespalib::duration pruneInterval) - : _tlsSpec(tlsSpec), _domain(domain), _client(tlsSpec.c_str()), _session(), + : _tlsSpec(tlsSpec), _domain(domain), _client(transport, tlsSpec.c_str()), _session(), _generator(generator), _visitors(), _rndVisitors(), _visitorInterval(visitorInterval), _pruneInterval(pruneInterval), _pruneTimer(), _begin(0), _end(0), _count(0) { for (uint32_t i = 0; i < numVisitors; ++i) { - _visitors.push_back(std::make_shared<VisitorAgent>(tlsSpec, domain, generator, i, true)); + _visitors.push_back(std::make_shared<VisitorAgent>(transport, tlsSpec, domain, generator, i, true)); } } ControllerThread::~ControllerThread() = default; @@ -704,7 +703,7 @@ TransLogStress::Main() FNET_Transport transport; DummyFileHeaderContext fileHeaderContext; TransLogServer tls(transport, "server", 17897, ".", fileHeaderContext, DomainConfig().setPartSizeLimit(_cfg.domainPartSize)); - TransLogClient client(tlsSpec); + TransLogClient client(transport, tlsSpec); client.create(domain); BufferGenerator bufferGenerator(_cfg.minStrLen, _cfg.maxStrLen); @@ -720,12 +719,12 @@ TransLogStress::Main() // start feeder and controller - FeederThread feeder(tlsSpec, domain, generator, _cfg.feedRate, _cfg.packetSize); + FeederThread feeder(transport, tlsSpec, domain, generator, _cfg.feedRate, _cfg.packetSize); threadPool.NewThread(&feeder); std::this_thread::sleep_for(sleepTime); - ControllerThread controller(tlsSpec, domain, generator, _cfg.numVisitors, _cfg.visitorInterval, _cfg.pruneInterval); + ControllerThread controller(transport, tlsSpec, domain, generator, _cfg.numVisitors, _cfg.visitorInterval, _cfg.pruneInterval); threadPool.NewThread(&controller); // stop feeder and controller |