diff options
Diffstat (limited to 'fnet/src/tests/frt')
-rw-r--r-- | fnet/src/tests/frt/method_pt/method_pt.cpp | 5 | ||||
-rw-r--r-- | fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp | 15 | ||||
-rw-r--r-- | fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp | 4 | ||||
-rw-r--r-- | fnet/src/tests/frt/rpc/detach_return_invoke.cpp | 5 | ||||
-rw-r--r-- | fnet/src/tests/frt/rpc/invoke.cpp | 13 | ||||
-rw-r--r-- | fnet/src/tests/frt/rpc/session.cpp | 4 | ||||
-rw-r--r-- | fnet/src/tests/frt/rpc/sharedblob.cpp | 4 |
7 files changed, 32 insertions, 18 deletions
diff --git a/fnet/src/tests/frt/method_pt/method_pt.cpp b/fnet/src/tests/frt/method_pt/method_pt.cpp index 53960d73466..450731fe1aa 100644 --- a/fnet/src/tests/frt/method_pt/method_pt.cpp +++ b/fnet/src/tests/frt/method_pt/method_pt.cpp @@ -1,8 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/vespalib/util/stringfmt.h> -#include <vespa/fnet/frt/frt.h> - +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> class Test; class SimpleHandler; 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 ed4911175a0..ff85b389780 100644 --- a/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp +++ b/fnet/src/tests/frt/parallel_rpc/parallel_rpc_test.cpp @@ -1,7 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/vespalib/util/stringfmt.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/rpcrequest.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/transport.h> +#include <vespa/fastos/thread.h> #include <vespa/vespalib/util/benchmark_timer.h> #include <vespa/vespalib/net/crypto_engine.h> #include <vespa/vespalib/net/tls/tls_crypto_engine.h> @@ -26,7 +29,7 @@ struct Rpc : FRT_Invokable { FRT_Target *connect(uint32_t port) { return orb.GetTarget(port); } - ~Rpc() { + ~Rpc() override { transport.ShutDown(true); thread_pool.Close(); } @@ -34,7 +37,7 @@ struct Rpc : FRT_Invokable { struct Server : Rpc { uint32_t port; - Server(CryptoEngine::SP crypto, size_t num_threads) : Rpc(crypto, num_threads), port(listen()) { + Server(CryptoEngine::SP crypto, size_t num_threads) : Rpc(std::move(crypto), num_threads), port(listen()) { init_rpc(); start(); } @@ -54,7 +57,7 @@ struct Server : Rpc { struct Client : Rpc { uint32_t port; - Client(CryptoEngine::SP crypto, size_t num_threads, const Server &server) : Rpc(crypto, num_threads), port(server.port) { + Client(CryptoEngine::SP crypto, size_t num_threads, const Server &server) : Rpc(std::move(crypto), num_threads), port(server.port) { start(); } FRT_Target *connect() { return Rpc::connect(port); } @@ -62,7 +65,7 @@ struct Client : Rpc { struct Result { std::vector<double> req_per_sec; - Result(size_t num_threads) : req_per_sec(num_threads, 0.0) {} + explicit Result(size_t num_threads) : req_per_sec(num_threads, 0.0) {} double throughput() const { double sum = 0.0; for (double sample: req_per_sec) { diff --git a/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp b/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp index cdb2636a8c1..8a954db26e0 100644 --- a/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp +++ b/fnet/src/tests/frt/parallel_rpc/tls_rpc_bench.cpp @@ -6,7 +6,9 @@ #include <vespa/vespalib/net/tls/tls_crypto_engine.h> #include <vespa/vespalib/test/make_tls_options_for_testing.h> #include <vespa/vespalib/test/time_tracer.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> #include <thread> #include <chrono> diff --git a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp index 95dbe672909..68bd58d2f82 100644 --- a/fnet/src/tests/frt/rpc/detach_return_invoke.cpp +++ b/fnet/src/tests/frt/rpc/detach_return_invoke.cpp @@ -1,6 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> +#include <vespa/fnet/frt/invoker.h> #include <vespa/vespalib/util/stringfmt.h> struct Receptor : public FRT_IRequestWait diff --git a/fnet/src/tests/frt/rpc/invoke.cpp b/fnet/src/tests/frt/rpc/invoke.cpp index 410a60fa08a..bd2f6fa9e1d 100644 --- a/fnet/src/tests/frt/rpc/invoke.cpp +++ b/fnet/src/tests/frt/rpc/invoke.cpp @@ -3,7 +3,10 @@ #include <vespa/vespalib/net/socket_spec.h> #include <vespa/vespalib/util/benchmark_timer.h> #include <vespa/vespalib/util/latch.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> +#include <vespa/fnet/frt/invoker.h> #include <mutex> #include <condition_variable> @@ -25,7 +28,7 @@ private: vespalib::Latch<FRT_RPCRequest*> _latch; public: RequestLatch() : _latch() {} - ~RequestLatch() { ASSERT_TRUE(!has_req()); } + ~RequestLatch() override { ASSERT_TRUE(!has_req()); } bool has_req() { return _latch.has_value(); } FRT_RPCRequest *read() { return _latch.read(); } void write(FRT_RPCRequest *req) { _latch.write(req); } @@ -38,8 +41,8 @@ class MyReq { private: FRT_RPCRequest *_req; public: - MyReq(FRT_RPCRequest *req) : _req(req) {} - MyReq(const char *method_name) + explicit MyReq(FRT_RPCRequest *req) : _req(req) {} + explicit MyReq(const char *method_name) : _req(new FRT_RPCRequest()) { _req->SetMethodName(method_name); @@ -270,8 +273,6 @@ public: _testRPC(&_server.supervisor()), _echoTest(&_server.supervisor()) { - _client.supervisor().GetTransport()->SetTCPNoDelay(true); - _server.supervisor().GetTransport()->SetTCPNoDelay(true); ASSERT_TRUE(_server.supervisor().Listen("tcp/0")); _peerSpec = SocketSpec::from_host_port("localhost", _server.supervisor().GetListenPort()).spec(); _target = _client.supervisor().GetTarget(_peerSpec.c_str()); diff --git a/fnet/src/tests/frt/rpc/session.cpp b/fnet/src/tests/frt/rpc/session.cpp index 24cbedb3ff7..b96c881ba27 100644 --- a/fnet/src/tests/frt/rpc/session.cpp +++ b/fnet/src/tests/frt/rpc/session.cpp @@ -1,7 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> #include <mutex> //------------------------------------------------------------- diff --git a/fnet/src/tests/frt/rpc/sharedblob.cpp b/fnet/src/tests/frt/rpc/sharedblob.cpp index 1c0503454c7..09297bbf1c3 100644 --- a/fnet/src/tests/frt/rpc/sharedblob.cpp +++ b/fnet/src/tests/frt/rpc/sharedblob.cpp @@ -1,7 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> -#include <vespa/fnet/frt/frt.h> +#include <vespa/fnet/frt/supervisor.h> +#include <vespa/fnet/frt/target.h> +#include <vespa/fnet/frt/rpcrequest.h> #include <vector> constexpr size_t ALLOC_LIMIT=1024; |