[coro_io] fix memory leak when io_context stopped before start.

alibaba · Jul 13, 2023 · b08e2de · b08e2de
1 parent 21030e4
commit b08e2de
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/include/ylt/coro_io/io_context_pool.hpp b/include/ylt/coro_io/io_context_pool.hpp
@@ -136,6 +136,10 @@ class io_context_pool {
       work_.clear();
 
       if (ok) {
+        // clear all unfinished work
+        for (auto &e : io_contexts_) {
+          e->run();
+        }
         return;
       }
 

diff --git a/include/ylt/coro_rpc/impl/coro_rpc_server.hpp b/include/ylt/coro_rpc/impl/coro_rpc_server.hpp
@@ -387,7 +387,7 @@ class coro_rpc_server_base {
   }
 
   void close_acceptor() {
-    asio::dispatch(acceptor_.get_executor(), [this]() {
+    asio::post(acceptor_.get_executor(), [this]() {
       asio::error_code ec;
       acceptor_.cancel(ec);
       acceptor_.close(ec);

diff --git a/src/coro_http/examples/channel.cpp b/src/coro_http/examples/channel.cpp
@@ -68,7 +68,7 @@ int main() {
                                       "http://www.baidu.com"};
   auto chan = coro_io::channel<coro_http_client>::create(
       hosts, coro_io::channel<coro_http_client>::channel_config{
-                 .pool_config{.max_connection_ = 1000}});
+                 .pool_config{.max_connection = 1000}});
 
   for (int i = 0, lim = std::thread::hardware_concurrency() * 10; i < lim; ++i)
     test_async_channel(chan).start([](auto &&) {

diff --git a/src/coro_rpc/examples/base_examples/channel.cpp b/src/coro_rpc/examples/base_examples/channel.cpp
@@ -91,7 +91,7 @@ int main() {
   auto worker_cnt = std::thread::hardware_concurrency() * 20;
   auto chan = coro_io::channel<coro_rpc_client>::create(
       hosts, coro_io::channel<coro_rpc_client>::channel_config{
-                 .pool_config{.max_connection_ = worker_cnt}});
+                 .pool_config{.max_connection = worker_cnt}});
   auto chan_ptr = std::make_shared<decltype(chan)>(std::move(chan));
   for (int i = 0; i < worker_cnt; ++i) {
     call_echo(chan_ptr, 10000).start([](auto &&) {

diff --git a/src/coro_rpc/examples/base_examples/client_pool.cpp b/src/coro_rpc/examples/base_examples/client_pool.cpp
@@ -78,7 +78,7 @@ int main() {
   auto client_pool = coro_io::client_pool<coro_rpc_client>::create(
       "localhost:8801",
       coro_io::client_pool<coro_rpc_client>::pool_config{
-          .max_connection_ = thread_cnt * 20,
+          .max_connection = thread_cnt * 20,
           .client_config = {.timeout_duration = std::chrono::seconds{50}}});
 
   for (int i = 0, lim = thread_cnt * 20; i < lim; ++i) {