diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-01 10:48:57 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2023-02-01 10:48:57 +0000 |
commit | 988fdfac3c51423aa4dd360693cfec7c985fcfb5 (patch) | |
tree | 07b0e45294b3504e9bf3ee9b6a9927b055beb4c4 /logd/src | |
parent | 99516f7e415a6d48f5b33bd6297ed3cff695fda8 (diff) |
Deinline destructors in metrics, fnet, jrt_test logd
Diffstat (limited to 'logd/src')
-rw-r--r-- | logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp | 29 | ||||
-rw-r--r-- | logd/src/tests/watcher/watcher_test.cpp | 18 |
2 files changed, 26 insertions, 21 deletions
diff --git a/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp b/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp index f5349face36..6fa56dfe5c4 100644 --- a/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp +++ b/logd/src/tests/rpc_forwarder/rpc_forwarder_test.cpp @@ -42,19 +42,8 @@ struct RpcServer : public FRT_Invokable { bool reply_with_proto_response; public: - RpcServer() - : server(), - request_count(0), - messages(), - reply_with_error(false), - reply_with_proto_response(true) - { - FRT_ReflectionBuilder builder(&server.supervisor()); - builder.DefineMethod("vespa.logserver.archiveLogMessages", "bix", "bix", - FRT_METHOD(RpcServer::rpc_archive_log_messages), this); - server.supervisor().Listen(0); - } - ~RpcServer() = default; + RpcServer(); + ~RpcServer() override; int get_listen_port() { return server.supervisor().GetListenPort(); } @@ -81,6 +70,20 @@ public: } }; +RpcServer::RpcServer() + : server(), + request_count(0), + messages(), + reply_with_error(false), + reply_with_proto_response(true) +{ + FRT_ReflectionBuilder builder(&server.supervisor()); + builder.DefineMethod("vespa.logserver.archiveLogMessages", "bix", "bix", + FRT_METHOD(RpcServer::rpc_archive_log_messages), this); + server.supervisor().Listen(0); +} +RpcServer::~RpcServer() = default; + std::string make_log_line(const std::string& level, const std::string& payload) { diff --git a/logd/src/tests/watcher/watcher_test.cpp b/logd/src/tests/watcher/watcher_test.cpp index 55ba720c0cb..fa8c2ffe932 100644 --- a/logd/src/tests/watcher/watcher_test.cpp +++ b/logd/src/tests/watcher/watcher_test.cpp @@ -61,14 +61,8 @@ struct DummyForwarder : public Forwarder { std::mutex lock; std::condition_variable cond; std::vector<std::string> lines; - DummyForwarder() - : Forwarder(), - lock(), - cond(), - lines() - { - } - ~DummyForwarder() override = default; + DummyForwarder(); + ~DummyForwarder() override; void forwardLine(std::string_view log_line) override { std::lock_guard guard(lock); lines.emplace_back(log_line); @@ -87,6 +81,14 @@ struct DummyForwarder : public Forwarder { } }; +DummyForwarder::DummyForwarder() + : Forwarder(), + lock(), + cond(), + lines() +{ } +DummyForwarder::~DummyForwarder() = default; + struct WatcherFixture { DummyForwarder fwd; |