[perf] change schedule stragety, pipeline bind with unique thread pool.

ChunelFeng · ChunelFeng · commit f62bcffef636 · 2023-02-11T02:05:55.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,7 +10,7 @@ message("* * * * * * * * * * * * * * * * * * * * * * * * * * * * *")
 
 cmake_minimum_required(VERSION 3.5.0)
 
-project(CGraph VERSION 2.3.1)
+project(CGraph VERSION 2.3.2)
 
 # CGraph默认使用C++11版本，推荐使用C++17版本。暂不支持C++11以下版本
 set(CMAKE_CXX_STANDARD 11)
diff --git a/README.md b/README.md
@@ -51,12 +51,6 @@
   $ make -j8
   ```
 
-<div style="text-align: center;">
-
-![CGraph Gamecock](https://github.com/ChunelFeng/CGraph/blob/main/doc/image/CGraph%20Gamecock.jpg)
-
-</div>
-
 * 若本地无法编译，提供基于`Ubuntu 20.04`的Docker镜像。输入以下指令，即可获取并进入
   ```shell
   $ docker pull chunelfeng/cenv                         # 获取docker镜像
@@ -283,6 +277,9 @@ int main() {
 
 [2023.01.25 - v2.3.1 - Chunel]
 * 提供针对C++11版本的支持。感谢 [MirrorYuChen](https://github.com/MirrorYuChen) 提供相关解决方案
+
+[2023.02.10 - v2.3.2 - Chunel]
+* 优化调度策略，提供调度参数配置接口
 * 提供英文版本readme.md
 
 </details>
diff --git a/README_en.md b/README_en.md
@@ -24,6 +24,8 @@ At the same time, you can also control the graph conditional judgment, loop or c
 
 You can transfer your params in many scenes. It is also possible to extend the functions of the above elements horizontally by adding `GAspect`, or to enhance the functions of individual nodes by introducing various `GAdapter`.
 
+![CGraph Skeleton](https://github.com/ChunelFeng/CGraph/blob/main/doc/image/CGraph%20Skeleton.jpg)
+<br>
 
 ## 2. Compile
 * This project supports MacOS, Linux, and Windows systems without any third-party dependencies. C++11 is default and lowest version, C++17 is recommended.
diff --git a/doc/image/CGraph Gamecock.jpg b/doc/image/CGraph Gamecock.jpg
diff --git a/src/GraphCtrl/GraphElement/GElement.cpp b/src/GraphCtrl/GraphElement/GElement.cpp
@@ -22,7 +22,6 @@ const std::string& GElement::getSession() const {
 
 GElement::GElement() {
     this->session_ = CGRAPH_GENERATE_SESSION;
-    this->thread_pool_ = UThreadPoolSingleton::get();
 }
 
 
@@ -236,4 +235,12 @@ CStatus GElement::notify(const std::string& key, CSize times) {
     CGRAPH_FUNCTION_END
 }
 
+
+GElement* GElement::setThreadPool(UThreadPoolPtr ptr) {
+    CGRAPH_ASSERT_NOT_NULL_RETURN_NULL(ptr)
+    CGRAPH_ASSERT_INIT_RETURN_NULL(false)
+    this->thread_pool_ = ptr;
+    return this;
+}
+
 CGRAPH_NAMESPACE_END
diff --git a/src/GraphCtrl/GraphElement/GElement.h b/src/GraphCtrl/GraphElement/GElement.h
@@ -211,6 +211,13 @@ class GElement : public GElementObject {
      */
     CStatus notify(const std::string& key, CSize times = 1);
 
+    /**
+     * 设置线程池信息
+     * @param ptr
+     * @return
+     */
+    GElement* setThreadPool(UThreadPoolPtr ptr);
+
     CGRAPH_NO_ALLOWED_COPY(GElement);
 
     CGRAPH_DECLARE_GPARAM_MANAGER_WRAPPER
diff --git a/src/GraphCtrl/GraphElement/GElementManager.cpp b/src/GraphCtrl/GraphElement/GElementManager.cpp
@@ -135,6 +135,7 @@ CStatus GElementManager::initEngine() {
     }
     CGRAPH_FUNCTION_CHECK_STATUS
 
+    engine_->setThreadPool(thread_pool_);
     status = engine_->setUp(manager_elements_);
     CGRAPH_FUNCTION_END
 }
diff --git a/src/GraphCtrl/GraphElement/GElementManager.h b/src/GraphCtrl/GraphElement/GElementManager.h
@@ -73,10 +73,22 @@ class GElementManager : public GElementObject, public GraphManager<GElement> {
      */
     CStatus initEngine();
 
+    /**
+     * 设置线程池
+     * @param ptr
+     * @return
+     */
+    GElementManager* setThreadPool(UThreadPoolPtr ptr) {
+        CGRAPH_ASSERT_NOT_NULL_RETURN_NULL(ptr)
+        this->thread_pool_ = ptr;
+        return this;
+    }
+
 private:
     GSortedGElementPtrSet manager_elements_;                    // 保存节点信息的内容
     GEnginePtr engine_ = nullptr;                               // 执行引擎
     GEngineType engine_type_ = GEngineType::STATIC;             // 引擎执行方式
+    UThreadPoolPtr thread_pool_ = nullptr;                      // 线程池
 
     friend class GPipeline;
     friend class GRegion;
diff --git a/src/GraphCtrl/GraphElement/GGroup/GRegion/GRegion.cpp b/src/GraphCtrl/GraphElement/GGroup/GRegion/GRegion.cpp
@@ -30,6 +30,7 @@ CStatus GRegion::init() {
     CGRAPH_ASSERT_NOT_NULL(manager_)
 
     // 在region中，需要专门的调度逻辑
+    this->manager_->setThreadPool(thread_pool_);
     this->manager_->setScheduleStrategy(CGRAPH_REGION_TASK_STRATEGY);
     status = this->manager_->init();
     CGRAPH_FUNCTION_CHECK_STATUS
diff --git a/src/GraphCtrl/GraphElement/GNode/GNode.h b/src/GraphCtrl/GraphElement/GNode/GNode.h
@@ -35,16 +35,6 @@ class GNode : public GElement {
      */
     GNode* setType(const GNodeType& type);
 
-    /**
-     * 异步执行信息，适用于传入静态类函数或者lambda表达式信息
-     * @tparam Func
-     * @tparam Args
-     * @param func
-     * @param args
-     */
-    template<typename Func, typename... Args>
-    static CStatus doDetach(const Func&& func, Args&&... args);
-
 private:
     GNodeType node_type_;                    // 节点类型
 };
@@ -54,6 +44,4 @@ using GNodePtrArr = std::vector<GNodePtr>;
 
 CGRAPH_NAMESPACE_END
 
-#include "GNode.inl"
-
 #endif //CGRAPH_GNODE_H
diff --git a/src/GraphCtrl/GraphElement/GNode/GNode.inl b/src/GraphCtrl/GraphElement/GNode/GNode.inl
diff --git a/src/GraphCtrl/GraphElement/_GEngine/GEngine.h b/src/GraphCtrl/GraphElement/_GEngine/GEngine.h
@@ -16,13 +16,6 @@ CGRAPH_NAMESPACE_BEGIN
 
 class GEngine : public GEngineObject {
 protected:
-    /**
-     * 构造函数
-     */
-    explicit GEngine() {
-        thread_pool_ = UThreadPoolSingleton::get();
-    }
-
     /**
      * 将所有注册进入 pipeline的内容，进行分析和解构
      * @param elements
@@ -36,6 +29,17 @@ class GEngine : public GEngineObject {
      */
     virtual CStatus afterRunCheck() = 0;
 
+    /**
+     * 设置线程池信息
+     * @param ptr
+     * @return
+     */
+    GEngine* setThreadPool(UThreadPoolPtr ptr) {
+        CGRAPH_ASSERT_NOT_NULL_RETURN_NULL(ptr)
+        thread_pool_ = ptr;
+        return this;
+    }
+
 protected:
     UThreadPoolPtr thread_pool_ { nullptr };                    // 内部执行的线程池
     CUint total_element_size_ = 0;                              // 总的element的数量
diff --git a/src/GraphCtrl/GraphEvent/GEventManager.cpp b/src/GraphCtrl/GraphEvent/GEventManager.cpp
@@ -59,6 +59,18 @@ CStatus GEventManager::trigger(const std::string& key) {
 }
 
 
+GEventObject* GEventManager::setThreadPool(UThreadPoolPtr ptr) {
+    CGRAPH_ASSERT_INIT_RETURN_NULL(false)
+    CGRAPH_ASSERT_NOT_NULL_RETURN_NULL(ptr)
+    for (auto& iter : events_map_) {
+        CGRAPH_ASSERT_NOT_NULL_RETURN_NULL(iter.second)
+        (iter.second)->setThreadPool(ptr);
+    }
+
+    return this;
+}
+
+
 GEventManager::~GEventManager() {
     clear();
 }
diff --git a/src/GraphCtrl/GraphEvent/GEventManager.h b/src/GraphCtrl/GraphEvent/GEventManager.h
@@ -46,6 +46,8 @@ class GEventManager : public GEventObject,
 
     CStatus clear() final;
 
+    GEventObject* setThreadPool(UThreadPoolPtr ptr) override;
+
     explicit GEventManager() = default;
 
     ~GEventManager() override;
diff --git a/src/GraphCtrl/GraphEvent/GEventObject.h b/src/GraphCtrl/GraphEvent/GEventObject.h
@@ -16,10 +16,6 @@ CGRAPH_NAMESPACE_BEGIN
 
 class GEventObject : public GraphObject {
 protected:
-    explicit GEventObject() {
-        thread_pool_ = UThreadPoolSingleton::get();
-    }
-
     ~GEventObject() override {
         CGRAPH_DELETE_PTR(param_)
     }
@@ -28,8 +24,13 @@ class GEventObject : public GraphObject {
         CGRAPH_NO_SUPPORT
     }
 
+    virtual GEventObject* setThreadPool(UThreadPoolPtr ptr) {
+        thread_pool_ = ptr;
+        return this;
+    }
+
 protected:
-    UThreadPoolPtr thread_pool_ = nullptr;                   // 线程池
+    UThreadPoolPtr thread_pool_ = nullptr;                   // 线程池类
     GParamManagerPtr param_manager_ = nullptr;               // GParam参数管理类
     GEventParamPtr param_ = nullptr;                         // 事件参数信息
 };
diff --git a/src/GraphCtrl/GraphPipeline/GPipeline.cpp b/src/GraphCtrl/GraphPipeline/GPipeline.cpp
@@ -11,12 +11,11 @@
 CGRAPH_NAMESPACE_BEGIN
 
 GPipeline::GPipeline() {
-    thread_pool_ = UThreadPoolSingleton::get();
+    thread_pool_ = UAllocator::safeMallocTemplateCObject<UThreadPool>(false);
     element_manager_ = CGRAPH_SAFE_MALLOC_COBJECT(GElementManager)
     param_manager_ = CGRAPH_SAFE_MALLOC_COBJECT(GParamManager)
     daemon_manager_ = CGRAPH_SAFE_MALLOC_COBJECT(GDaemonManager)
     event_manager_ = CGRAPH_SAFE_MALLOC_COBJECT(GEventManager)
-    is_init_ = false;
 }
 
 
@@ -25,6 +24,7 @@ GPipeline::~GPipeline() {
     CGRAPH_DELETE_PTR(element_manager_)
     CGRAPH_DELETE_PTR(param_manager_)
     CGRAPH_DELETE_PTR(event_manager_)
+    CGRAPH_DELETE_PTR(thread_pool_)
 
     // 结束的时候，清空所有创建的节点信息。所有节点信息，仅在这一处释放
     for (GElementPtr element : element_repository_) {
@@ -42,6 +42,9 @@ CStatus GPipeline::init() {
     CGRAPH_ASSERT_NOT_NULL(daemon_manager_)
     CGRAPH_ASSERT_NOT_NULL(event_manager_)
 
+    status += initSchedule();
+    CGRAPH_FUNCTION_CHECK_STATUS
+
     status += param_manager_->init();
     status += event_manager_->init();
     status += element_manager_->init();
@@ -90,6 +93,10 @@ CStatus GPipeline::destroy() {
     status += param_manager_->destroy();
     CGRAPH_FUNCTION_CHECK_STATUS
 
+    // 结束单个线程池信息
+    status += thread_pool_->destroy();
+    CGRAPH_FUNCTION_CHECK_STATUS
+
     is_init_ = false;
     CGRAPH_FUNCTION_END
 }
@@ -129,4 +136,35 @@ GPipelinePtr GPipeline::setGEngineType(GEngineType type) {
     return this;
 }
 
+
+GPipelinePtr GPipeline::setThreadPoolConfig(const UThreadPoolConfig& config) {
+    CGRAPH_FUNCTION_BEGIN
+    CGRAPH_ASSERT_INIT_RETURN_NULL(false)
+    CGRAPH_ASSERT_NOT_NULL_RETURN_NULL(thread_pool_)
+    status = thread_pool_->setConfig(config);
+    CGRAPH_CHECK_STATUS_RETURN_THIS_OR_NULL
+}
+
+
+CStatus GPipeline::initSchedule() {
+    CGRAPH_FUNCTION_BEGIN
+    CGRAPH_ASSERT_NOT_NULL(thread_pool_)
+    CGRAPH_ASSERT_NOT_NULL(event_manager_)
+    CGRAPH_ASSERT_NOT_NULL(element_manager_)
+
+    status += thread_pool_->init();
+    CGRAPH_FUNCTION_CHECK_STATUS
+
+    event_manager_->setThreadPool(thread_pool_);
+    element_manager_->setThreadPool(thread_pool_);
+
+    // 设置所有的element 中的thread_pool
+    for (auto& iter : this->element_repository_) {
+        CGRAPH_ASSERT_NOT_NULL(iter)
+        iter->setThreadPool(thread_pool_);
+    }
+
+    CGRAPH_FUNCTION_END
+}
+
 CGRAPH_NAMESPACE_END
diff --git a/src/GraphCtrl/GraphPipeline/GPipeline.h b/src/GraphCtrl/GraphPipeline/GPipeline.h
@@ -191,6 +191,13 @@ class GPipeline : public GPipelineObject {
      */
     GPipeline* setGEngineType(GEngineType type);
 
+    /**
+     * 设置线程池相关信息
+     * @param config
+     * @return
+     */
+    GPipeline* setThreadPoolConfig(const UThreadPoolConfig& config);
+
     /**
      * 注册GParam 交互类集合
      * @return
@@ -201,6 +208,12 @@ class GPipeline : public GPipelineObject {
     explicit GPipeline();
     ~GPipeline() override;
 
+    /**
+     * 初始化调度信息，包括线程池
+     * @return
+     */
+    CStatus initSchedule();
+
     /** 不允许外部赋值和构造 */
     CGRAPH_NO_ALLOWED_COPY(GPipeline)
 
diff --git a/src/GraphCtrl/GraphPipeline/GPipelineFactory.cpp b/src/GraphCtrl/GraphPipeline/GPipelineFactory.cpp
@@ -17,10 +17,6 @@ GPipelinePtr GPipelineFactory::create() {
     CGRAPH_FUNCTION_BEGIN
     CGRAPH_LOCK_GUARD lock(s_lock_);
 
-    if (s_pipeline_list_.empty()) {
-        UThreadPoolSingleton::get();    // 默认直接开启线程池了
-    }
-
     auto pipeline = CGRAPH_SAFE_MALLOC_COBJECT(GPipeline)
     s_pipeline_list_.emplace_back(pipeline);
     return pipeline;
@@ -35,10 +31,6 @@ CStatus GPipelineFactory::remove(GPipelinePtr pipeline) {
     s_pipeline_list_.remove(pipeline);
     CGRAPH_DELETE_PTR(pipeline)
 
-    if (s_pipeline_list_.empty()) {
-        status = UThreadPoolSingleton::get(false)->destroy();
-    }
-
     CGRAPH_FUNCTION_END
 }
 
@@ -52,7 +44,6 @@ CStatus GPipelineFactory::clear() {
     }
 
     s_pipeline_list_.clear();
-    status = UThreadPoolSingleton::get(false)->destroy();
     CGRAPH_FUNCTION_END
 }
 
diff --git a/src/UtilsCtrl/ThreadPool/UThreadPoolInclude.h b/src/UtilsCtrl/ThreadPool/UThreadPoolInclude.h
@@ -12,7 +12,6 @@
 #include "UThreadObject.h"
 #include "UThreadPool.h"
 #include "UThreadPoolDefine.h"
-#include "UThreadPoolSingleton.h"
 #include "UThreadPoolConfig.h"
 #include "Queue/UQueueInclude.h"
 #include "Task/UTaskInclude.h"
diff --git a/src/UtilsCtrl/ThreadPool/UThreadPoolSingleton.cpp b/src/UtilsCtrl/ThreadPool/UThreadPoolSingleton.cpp
diff --git a/src/UtilsCtrl/ThreadPool/UThreadPoolSingleton.h b/src/UtilsCtrl/ThreadPool/UThreadPoolSingleton.h
diff --git a/tutorial/T04-Complex.cpp b/tutorial/T04-Complex.cpp

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,7 @@ CStatus GElementManager::initEngine() {`
`135`	`135`	`}`
`136`	`136`	`CGRAPH_FUNCTION_CHECK_STATUS`
`137`	`137`
	`138`	`+ engine_->setThreadPool(thread_pool_);`
`138`	`139`	`status = engine_->setUp(manager_elements_);`
`139`	`140`	`CGRAPH_FUNCTION_END`
`140`	`141`	`}`