fix(eventx):1.10.2, 修复了ThreadPool的bug，以及http示例的问题

hevake · hevake · commit f07b25de2789 · 2024-07-19T12:42:17.000+08:00
1. 解决TimerPool::doAfter()，在定时完成之后，没有立即析构定时器的问题
2. 修复了examples/http/server/async_respond 中访问，没有返回的问题
diff --git a/examples/http/server/async_respond/async_respond.cpp b/examples/http/server/async_respond/async_respond.cpp
@@ -17,12 +17,15 @@
  * project authors may be found in the CONTRIBUTORS.md file in the root
  * of the source tree.
  */
+#include <thread>
+
 #include <tbox/base/log.h>
 #include <tbox/base/log_output.h>
 #include <tbox/base/scope_exit.hpp>
 #include <tbox/log/async_stdout_sink.h>
 #include <tbox/event/signal_event.h>
 #include <tbox/eventx/timer_pool.h>
+#include <tbox/eventx/thread_pool.h>
 #include <tbox/http/server/server.h>
 
 using namespace tbox;
@@ -46,7 +49,10 @@ int main(int argc, char **argv)
     auto sp_loop = Loop::New();
     auto sp_sig_event = sp_loop->newSignalEvent();
 
-    TimerPool timers(sp_loop);
+    TimerPool timer_pool(sp_loop);
+    ThreadPool thread_pool(sp_loop);
+
+    thread_pool.initialize(1);
 
     SetScopeExitAction(
         [=] {
@@ -77,18 +83,39 @@ R"(
 <head>
 </head>
 <body>
-    <p> <a href="/1" target="_blank">delay</a> </p>
-    <p> <a href="/2" target="_blank">now</a> </p>
+    <p> <a href="/1" target="_blank">nodelay</a> </p>
+    <p> <a href="/2" target="_blank">delay 5 sec</a> </p>
+    <p> <a href="/3" target="_blank">delay 0~10 sec</a> </p>
 </body>
 )";
             } else if (ctx->req().url.path == "/1") {
-                timers.doAfter(std::chrono::seconds(10), [ctx] {
+                ctx->res().status_code = StatusCode::k200_OK;
+                ctx->res().body = ctx->req().url.path;
+
+            } else if (ctx->req().url.path == "/2") {
+                timer_pool.doAfter(std::chrono::seconds(5), [ctx] {
                     ctx->res().status_code = StatusCode::k200_OK;
                     ctx->res().body = ctx->req().url.path;
                 });
-            } else if (ctx->req().url.path == "/2") {
-                ctx->res().status_code = StatusCode::k200_OK;
-                ctx->res().body = ctx->req().url.path;
+
+            } else if (ctx->req().url.path == "/3") {
+                struct Tmp {
+                    int result;
+                };
+                auto tmp = std::make_shared<Tmp>();
+                thread_pool.execute(
+                    [tmp] {
+                        //! 模拟随机的，不确定时长的阻塞性行为
+                        auto wait_msec = ::rand() % 10000;
+                        LogTrace("wait_msec: %d", wait_msec);
+                        std::this_thread::sleep_for(std::chrono::milliseconds(wait_msec));
+                        tmp->result = wait_msec;
+                    },
+                    [ctx, tmp] {
+                        ctx->res().status_code = StatusCode::k200_OK;
+                        ctx->res().body = "wait: " + std::to_string(tmp->result) + " msec";
+                    }
+                );
             }
         }
     );
@@ -105,6 +132,9 @@ R"(
     LogInfo("stop");
     srv.cleanup();
 
+    thread_pool.cleanup();
+    timer_pool.cleanup();
+
     LogInfo("exit");
     return 0;
 }
diff --git a/modules/eventx/timer_pool.cpp b/modules/eventx/timer_pool.cpp
@@ -58,11 +58,11 @@ TimerPool::TimerToken TimerPool::Impl::doEvery(const Milliseconds &m_sec, Callba
         return TimerToken();
     }
 
-    auto new_timer = wp_loop_->newTimerEvent("TimerPool::doEvery");
-    auto new_token = timers_.alloc(new_timer);
-    new_timer->initialize(m_sec, event::Event::Mode::kPersist);
-    new_timer->setCallback(std::move(cb));
-    new_timer->enable();
+    auto this_timer = wp_loop_->newTimerEvent("TimerPool::doEvery");
+    auto new_token = timers_.alloc(this_timer);
+    this_timer->initialize(m_sec, event::Event::Mode::kPersist);
+    this_timer->setCallback(std::move(cb));
+    this_timer->enable();
     return new_token;
 }
 
@@ -73,11 +73,24 @@ TimerPool::TimerToken TimerPool::Impl::doAfter(const Milliseconds &m_sec, Callba
         return TimerToken();
     }
 
-    auto new_timer = wp_loop_->newTimerEvent("TimerPool::doAfter");
-    auto new_token = timers_.alloc(new_timer);
-    new_timer->initialize(m_sec, event::Event::Mode::kOneshot);
-    new_timer->setCallback(std::move(cb));
-    new_timer->enable();
+    auto this_timer = wp_loop_->newTimerEvent("TimerPool::doAfter");
+    auto new_token = timers_.alloc(this_timer);
+    this_timer->initialize(m_sec, event::Event::Mode::kOneshot);
+
+#if __cplusplus >= 201402L
+    this_timer->setCallback([loop = wp_loop_, moved_cb = std::move(cb), this_timer] {
+        moved_cb();
+        loop->runNext([this_timer] { delete this_timer; });
+    });
+#elif __cplusplus >= 201103L
+    auto loop = wp_loop_;
+    this_timer->setCallback([loop, cb, this_timer] {
+        cb();
+        loop->runNext([this_timer] { delete this_timer; });
+    });
+#endif
+
+    this_timer->enable();
     return new_token;
 }
 
diff --git a/version.mk b/version.mk
@@ -21,4 +21,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 10
-TBOX_VERSION_REVISION := 1
+TBOX_VERSION_REVISION := 2
