diff --git a/include/ylt/coro_rpc/impl/coro_rpc_client.hpp b/include/ylt/coro_rpc/impl/coro_rpc_client.hpp index ddcf0f5d5..1ad48a14b 100644 --- a/include/ylt/coro_rpc/impl/coro_rpc_client.hpp +++ b/include/ylt/coro_rpc/impl/coro_rpc_client.hpp @@ -88,7 +88,7 @@ struct rpc_return_type { using type = std::monostate; }; -struct rpc_resp_buffer { +struct resp_body { std::string read_buf_; std::string resp_attachment_buf_; }; @@ -97,10 +97,10 @@ template struct async_rpc_result_value_t { private: T result_; - rpc_resp_buffer buffer_; + resp_body buffer_; public: - async_rpc_result_value_t(T &&result, rpc_resp_buffer &&buffer) + async_rpc_result_value_t(T &&result, resp_body &&buffer) : result_(std::move(result)), buffer_(std::move(buffer)) {} async_rpc_result_value_t(T &&result) : result_(std::move(result)) {} T &result() noexcept { return result_; } @@ -108,16 +108,16 @@ struct async_rpc_result_value_t { std::string_view attachment() const noexcept { return buffer_.resp_attachment_buf_; } - rpc_resp_buffer release_buffer() { return std::move(buffer_); } + resp_body release_buffer() { return std::move(buffer_); } }; template <> struct async_rpc_result_value_t { - rpc_resp_buffer buffer_; + resp_body buffer_; std::string_view attachment() const noexcept { return buffer_.resp_attachment_buf_; } - rpc_resp_buffer release_buffer() { return std::move(buffer_); } + resp_body release_buffer() { return std::move(buffer_); } }; template @@ -586,7 +586,7 @@ class coro_rpc_client { template static rpc_result handle_response_buffer(std::string_view buffer, uint8_t rpc_errc, - bool &should_close) { + bool &has_error) { rpc_return_type_t ret; struct_pack::err_code ec; rpc_error err; @@ -607,7 +607,7 @@ class coro_rpc_client { err.val() = rpc_errc; ec = struct_pack::deserialize_to(err.msg, buffer); if SP_LIKELY (!ec) { - should_close = true; + has_error = true; return rpc_result{unexpect_t{}, std::move(err)}; } } @@ -618,7 +618,7 @@ class coro_rpc_client { } } } - should_close = true; + has_error = true; // deserialize failed. ELOGV(WARNING, "deserilaize rpc result failed"); err = {errc::invalid_rpc_result, "failed to deserialize rpc return value"}; @@ -665,7 +665,7 @@ class coro_rpc_client { } struct async_rpc_raw_result_value_type { - rpc_resp_buffer buffer_; + resp_body buffer_; uint8_t errc_; }; @@ -680,7 +680,7 @@ class coro_rpc_client { handler_t(std::unique_ptr &&timer, async_simple::Promise &&promise) : timer_(std::move(timer)), promise_(std::move(promise)) {} - void operator()(rpc_resp_buffer &&buffer, uint8_t rpc_errc) { + void operator()(resp_body &&buffer, uint8_t rpc_errc) { timer_->cancel(); promise_.setValue(async_rpc_raw_result{ async_rpc_raw_result_value_type{std::move(buffer), rpc_errc}}); @@ -701,7 +701,7 @@ class coro_rpc_client { std::atomic has_closed_ = false; coro_io::ExecutorWrapper<> executor_; std::unordered_map response_handler_table_; - rpc_resp_buffer resp_buffer_; + resp_body resp_buffer_; asio::ip::tcp::socket socket_; std::atomic recving_cnt_ = 0; control_t(asio::io_context::executor_type executor, bool is_timeout) @@ -860,7 +860,7 @@ class coro_rpc_client { } template - static async_simple::coro::Lazy> get_deserializer( + static async_simple::coro::Lazy> deserialize_rpc_result( async_simple::Future future, std::weak_ptr watcher) { auto ret_ = co_await std::move(future); @@ -878,11 +878,11 @@ class coro_rpc_client { } } - bool should_close = false; + bool has_error = false; auto &ret = std::get<0>(ret_); auto result = handle_response_buffer(ret.buffer_.read_buf_, ret.errc_, - should_close); - if (should_close) { + has_error); + if (has_error) { if (auto w = watcher.lock(); w) { close_socket(std::move(w)); } @@ -992,7 +992,7 @@ class coro_rpc_client { #endif } guard.release(); - co_return get_deserializer( + co_return deserialize_rpc_result( std::move(future), std::weak_ptr{control_}); } }