[perf] notify all snd thd when destory threadpoll

ChunelFeng · Oct 26, 2024 · 3d0f45f · 3d0f45f
1 parent 4d570f2
commit 3d0f45f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/UtilsCtrl/ThreadPool/Queue/UAtomicQueue.h b/src/UtilsCtrl/ThreadPool/Queue/UAtomicQueue.h
@@ -135,6 +135,15 @@ class UAtomicQueue : public UQueueObject {
         return queue_.empty();
     }
 
+
+    /**
+     * 唤醒所有等待的
+     * @return
+     */
+    CVoid notifyAll() {
+        cv_.notify_all();
+    }
+
     CGRAPH_NO_ALLOWED_COPY(UAtomicQueue)
 
 private:

diff --git a/src/UtilsCtrl/ThreadPool/Thread/UThreadSecondary.h b/src/UtilsCtrl/ThreadPool/Thread/UThreadSecondary.h
@@ -95,7 +95,7 @@ class UThreadSecondary : public UThreadBase {
     CVoid waitRunTask(CMSec ms) {
         auto task = this->pool_task_queue_->popWithTimeout(ms);
         if (nullptr != task) {
-            (*task)();
+            runTask(*task);
         }
     }
 

diff --git a/src/UtilsCtrl/ThreadPool/UThreadPool.cpp b/src/UtilsCtrl/ThreadPool/UThreadPool.cpp
@@ -160,6 +160,8 @@ CStatus UThreadPool::destroy() {
         CGRAPH_DELETE_PTR(pt)
     }
     primary_threads_.clear();
+
+    task_queue_.notifyAll();
     // secondary 线程是智能指针，不需要delete
     for (auto &st : secondary_threads_) {
         status += st->destroy();

diff --git a/src/UtilsCtrl/ThreadPool/UThreadPoolDefine.h b/src/UtilsCtrl/ThreadPool/UThreadPoolDefine.h
@@ -60,7 +60,7 @@ static const CMSec CGRAPH_PRIMARY_THREAD_EMPTY_INTERVAL = 1000;
 static const CSec CGRAPH_SECONDARY_THREAD_TTL = 10;                                          // 辅助线程ttl，单位为s
 static const CBool CGRAPH_MONITOR_ENABLE = false;                                            // 是否开启监控程序
 static const CSec CGRAPH_MONITOR_SPAN = 5;                                                   // 监控线程执行间隔，单位为s
-static const CMSec CGRAPH_QUEUE_EMPTY_INTERVAL = 3;                                          // 队列为空时，等待的时间。仅针对辅助线程，单位为ms
+static const CMSec CGRAPH_QUEUE_EMPTY_INTERVAL = 300;                                        // 队列为空时，等待的时间。仅针对辅助线程，单位为ms
 static const CBool CGRAPH_BIND_CPU_ENABLE = false;                                           // 是否开启绑定cpu模式（仅针对主线程）
 static const CInt CGRAPH_PRIMARY_THREAD_POLICY = CGRAPH_THREAD_SCHED_OTHER;                  // 主线程调度策略
 static const CInt CGRAPH_SECONDARY_THREAD_POLICY = CGRAPH_THREAD_SCHED_OTHER;                // 辅助线程调度策略