From ad84818daa17b6889f6dbac02dc4ec4a14e90746 Mon Sep 17 00:00:00 2001 From: "Zezheng.Li" Date: Mon, 5 Aug 2024 11:43:34 +0800 Subject: [PATCH] rename coro_channel to channel --- include/ylt/coro_io/coro_io.hpp | 11 +++++------ src/coro_http/examples/load_blancer.cpp | 3 +-- src/coro_io/tests/test_coro_channel.cpp | 4 ++-- src/coro_rpc/examples/base_examples/load_blancer.cpp | 3 +-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/ylt/coro_io/coro_io.hpp b/include/ylt/coro_io/coro_io.hpp index 4c9755977..2f4b7900c 100644 --- a/include/ylt/coro_io/coro_io.hpp +++ b/include/ylt/coro_io/coro_io.hpp @@ -364,12 +364,11 @@ post(Func func, } template -struct coro_channel - : public asio::experimental::channel { +struct channel : public asio::experimental::channel { using return_type = R; using ValueType = std::pair; using asio::experimental::channel::channel; - coro_channel(coro_io::ExecutorWrapper<> *executor, size_t capacity) + channel(coro_io::ExecutorWrapper<> *executor, size_t capacity) : executor_(executor), asio::experimental::channel( executor->get_asio_executor(), capacity) {} @@ -380,17 +379,17 @@ struct coro_channel }; template -inline coro_channel create_load_blancer( +inline channel create_load_blancer( size_t capacity, coro_io::ExecutorWrapper<> *executor = coro_io::get_global_executor()) { - return coro_channel(executor, capacity); + return channel(executor, capacity); } template inline auto create_shared_channel( size_t capacity, coro_io::ExecutorWrapper<> *executor = coro_io::get_global_executor()) { - return std::make_shared>(executor, capacity); + return std::make_shared>(executor, capacity); } template diff --git a/src/coro_http/examples/load_blancer.cpp b/src/coro_http/examples/load_blancer.cpp index 36d6e7932..7be401c6f 100644 --- a/src/coro_http/examples/load_blancer.cpp +++ b/src/coro_http/examples/load_blancer.cpp @@ -67,8 +67,7 @@ int main() { std::vector hosts{"http://baidu.com", "http://www.baidu.com"}; auto chan = coro_io::load_blancer::create( - hosts, coro_io::load_blancer::load_blancer_config{ - .pool_config{.max_connection = 100}}); + hosts, {.pool_config{.max_connection = 100}}); for (int i = 0, lim = std::thread::hardware_concurrency(); i < lim; ++i) test_async_load_blancer(chan).start([](auto &&) { diff --git a/src/coro_io/tests/test_coro_channel.cpp b/src/coro_io/tests/test_coro_channel.cpp index 423079172..fa5135dce 100644 --- a/src/coro_io/tests/test_coro_channel.cpp +++ b/src/coro_io/tests/test_coro_channel.cpp @@ -19,7 +19,7 @@ using namespace std::chrono_literals; #define IS_OK #endif -async_simple::coro::Lazy test_coro_channel() { +async_simple::coro::Lazy test_channel() { auto ch = coro_io::create_load_blancer(1000); co_await coro_io::async_send(ch, 41); @@ -162,7 +162,7 @@ void callback_lazy() { } TEST_CASE("test channel send recieve, test select channel and coroutine") { - async_simple::coro::syncAwait(test_coro_channel()); + async_simple::coro::syncAwait(test_channel()); async_simple::coro::syncAwait(test_select_channel()); callback_lazy(); } \ No newline at end of file diff --git a/src/coro_rpc/examples/base_examples/load_blancer.cpp b/src/coro_rpc/examples/base_examples/load_blancer.cpp index e2070e4ac..f91330004 100644 --- a/src/coro_rpc/examples/base_examples/load_blancer.cpp +++ b/src/coro_rpc/examples/base_examples/load_blancer.cpp @@ -113,8 +113,7 @@ int main() { std::vector{"127.0.0.1:8801", "localhost:8801"}; auto worker_cnt = std::thread::hardware_concurrency() * 20; auto chan = coro_io::load_blancer::create( - hosts, coro_io::load_blancer::load_blancer_config{ - .pool_config{.max_connection = worker_cnt}}); + hosts, {.pool_config{.max_connection = worker_cnt}}); auto chan_ptr = std::make_shared(std::move(chan)); auto executor = coro_io::get_global_block_executor(); for (int i = 0; i < worker_cnt; ++i) {