[perf] remove thread config fair_lock_enable_, for the reason of no use.

ChunelFeng · ChunelFeng · commit dd0400e9415f · 2023-04-12T23:34:53.000+08:00
diff --git a/cmake/CGraph-env-include.cmake b/cmake/CGraph-env-include.cmake
@@ -9,7 +9,7 @@ file(GLOB_RECURSE CGRAPH_PROJECT_SRC_LIST "${CGRAPH_PROJECT_ROOT_DIR}/src/*.cpp"
 
 IF(APPLE)
     # 非mac平台，暂时不支持自动生成session信息
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 -O2 \
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64 \
         -finline-functions -Wno-deprecated-declarations -Wno-c++17-extensions")
     add_definitions(-D_ENABLE_LIKELY_)
 ELSEIF(UNIX)
diff --git a/src/UtilsCtrl/ThreadPool/Thread/UThreadBase.h b/src/UtilsCtrl/ThreadPool/Thread/UThreadBase.h
@@ -118,6 +118,40 @@ class UThreadBase : public UThreadObject {
         total_task_num_ = 0;
     }
 
+    /**
+     * 执行单个消息
+     * @return
+     */
+    virtual CVoid processTask() = 0;
+
+
+    /**
+     * 获取批量执行task信息
+     */
+    virtual CVoid processTasks() = 0;
+
+
+    /**
+     * 循环处理任务
+     * @return
+     */
+    CStatus loopProcess() {
+        CGRAPH_FUNCTION_BEGIN
+        CGRAPH_ASSERT_NOT_NULL(config_)
+
+        if (config_->batch_task_enable_) {
+            while (done_) {
+                processTasks();    // 批量任务获取执行接口
+            }
+        } else {
+            while (done_) {
+                processTask();    // 单个任务获取执行接口
+            }
+        }
+
+        CGRAPH_FUNCTION_END
+    }
+
 
     /**
     * 设置线程优先级，仅针对非windows平台使用
diff --git a/src/UtilsCtrl/ThreadPool/Thread/UThreadPrimary.h b/src/UtilsCtrl/ThreadPool/Thread/UThreadPrimary.h
@@ -67,7 +67,6 @@ class UThreadPrimary : public UThreadBase {
         CGRAPH_FUNCTION_BEGIN
         CGRAPH_ASSERT_INIT(true)
         CGRAPH_ASSERT_NOT_NULL(pool_threads_)
-        CGRAPH_ASSERT_NOT_NULL(config_)
 
         /**
          * 线程池中任何一个primary线程为null都不可以执行
@@ -81,25 +80,12 @@ class UThreadPrimary : public UThreadBase {
             CGRAPH_RETURN_ERROR_STATUS("primary thread is null")
         }
 
-        if (config_->calcBatchTaskRatio()) {
-            while (done_) {
-                processTasks();    // 批量任务获取执行接口
-            }
-        } else {
-            while (done_) {
-                processTask();    // 单个任务获取执行接口
-            }
-        }
-
+        status = loopProcess();
         CGRAPH_FUNCTION_END
     }
 
 
-    /**
-     * 获取并执行任务
-     * @return
-     */
-    CVoid processTask() {
+    CVoid processTask() override {
         UTask task;
         if (popTask(task) || popPoolTask(task) || stealTask(task)) {
             runTask(task);
@@ -109,10 +95,7 @@ class UThreadPrimary : public UThreadBase {
     }
 
 
-    /**
-     * 获取批量执行task信息
-     */
-    CVoid processTasks() {
+    CVoid processTasks() override {
         UTaskArr tasks;
         if (popTask(tasks) || popPoolTask(tasks) || stealTask(tasks)) {
             // 尝试从主线程中获取/盗取批量task，如果成功，则依次执行
@@ -201,7 +184,7 @@ class UThreadPrimary : public UThreadBase {
     }
 
 private:
-    int index_ {CGRAPH_SECONDARY_THREAD_COMMON_ID};                // 线程index
+    int index_;                                                    // 线程index
     UWorkStealingQueue work_stealing_queue_;                       // 内部队列信息
     std::vector<UThreadPrimary *>* pool_threads_;                  // 用于存放线程池中的线程信息
 
diff --git a/src/UtilsCtrl/ThreadPool/Thread/UThreadSecondary.h b/src/UtilsCtrl/ThreadPool/Thread/UThreadSecondary.h
@@ -61,26 +61,13 @@ class UThreadSecondary : public UThreadBase {
     CStatus run() override {
         CGRAPH_FUNCTION_BEGIN
         CGRAPH_ASSERT_INIT(true)
-        CGRAPH_ASSERT_NOT_NULL(config_)
-
-        if (config_->calcBatchTaskRatio()) {
-            while (done_) {
-                processTasks();    // 批量任务获取执行接口
-            }
-        } else {
-            while (done_) {
-                processTask();    // 单个任务获取执行接口
-            }
-        }
 
+        status = loopProcess();
         CGRAPH_FUNCTION_END
     }
 
 
-    /**
-     * 任务执行函数，从线程池的任务队列中获取信息
-     */
-    CVoid processTask() {
+    CVoid processTask() override {
         UTask task;
         if (popPoolTask(task)) {
             runTask(task);
@@ -90,10 +77,7 @@ class UThreadSecondary : public UThreadBase {
     }
 
 
-    /**
-     * 批量执行n个任务
-     */
-    CVoid processTasks() {
+    CVoid processTasks() override {
         UTaskArr tasks;
         if (popPoolTask(tasks)) {
             runTasks(tasks);
diff --git a/src/UtilsCtrl/ThreadPool/UThreadPool.cpp b/src/UtilsCtrl/ThreadPool/UThreadPool.cpp
@@ -164,10 +164,6 @@ CBool UThreadPool::isInit() const {
 
 
 CIndex UThreadPool::dispatch(CIndex origIndex) {
-    if (unlikely(config_.fair_lock_enable_)) {
-        return CGRAPH_DEFAULT_TASK_STRATEGY;    // 如果开启fair lock，则全部写入 pool的queue中，依次执行
-    }
-
     CIndex realIndex = 0;
     if (CGRAPH_DEFAULT_TASK_STRATEGY == origIndex) {
         /**
diff --git a/src/UtilsCtrl/ThreadPool/UThreadPoolConfig.h b/src/UtilsCtrl/ThreadPool/UThreadPoolConfig.h
@@ -31,7 +31,6 @@ struct UThreadPoolConfig : public UThreadObject {
     int secondary_thread_priority_ = CGRAPH_SECONDARY_THREAD_PRIORITY;
     bool bind_cpu_enable_ = CGRAPH_BIND_CPU_ENABLE;
     bool batch_task_enable_ = CGRAPH_BATCH_TASK_ENABLE;
-    bool fair_lock_enable_ = CGRAPH_FAIR_LOCK_ENABLE;
     bool monitor_enable_ = CGRAPH_MONITOR_ENABLE;
 
 
@@ -45,17 +44,6 @@ struct UThreadPoolConfig : public UThreadObject {
         return range;
     }
 
-
-    /**
-     * 计算是否开启批量任务
-     * 开启条件：开关批量开启，并且 未开启非公平锁
-     * @return
-     */
-    bool calcBatchTaskRatio() const {
-        bool ratio = (this->batch_task_enable_) && (!this->fair_lock_enable_);
-        return ratio;
-    }
-
     friend class UThreadPrimary;
     friend class UThreadSecondary;
 };
diff --git a/src/UtilsCtrl/ThreadPool/UThreadPoolDefine.h b/src/UtilsCtrl/ThreadPool/UThreadPoolDefine.h
@@ -67,9 +67,8 @@ static const bool CGRAPH_BATCH_TASK_ENABLE = false;
 static const int CGRAPH_MAX_LOCAL_BATCH_SIZE = 2;                                           // 批量执行本地任务最大值
 static const int CGRAPH_MAX_POOL_BATCH_SIZE = 2;                                            // 批量执行通用任务最大值
 static const int CGRAPH_MAX_STEAL_BATCH_SIZE = 2;                                           // 批量盗取任务最大值
-static const bool CGRAPH_FAIR_LOCK_ENABLE = false;                                          // 是否开启公平锁（非必须场景不建议开启，开启后CGRAPH_BATCH_TASK_ENABLE无效）
 static const int CGRAPH_SECONDARY_THREAD_TTL = 10;                                          // 辅助线程ttl，单位为s
-static const bool CGRAPH_MONITOR_ENABLE = true;                                             // 是否开启监控程序（如果不开启，辅助线程策略将失效。建议开启）
+static const bool CGRAPH_MONITOR_ENABLE = false;                                            // 是否开启监控程序（如果不开启，辅助线程策略将失效）
 static const int CGRAPH_MONITOR_SPAN = 5;                                                   // 监控线程执行间隔，单位为s
 static const bool CGRAPH_BIND_CPU_ENABLE = true;                                            // 是否开启绑定cpu模式（仅针对主线程）
 static const int CGRAPH_PRIMARY_THREAD_POLICY = CGRAPH_THREAD_SCHED_OTHER;                  // 主线程调度策略
diff --git a/tutorial/T09-Aspect.cpp b/tutorial/T09-Aspect.cpp
@@ -19,7 +19,7 @@ void tutorial_aspect() {
 
     GElementPtr a, b_region, c = nullptr;
     b_region = pipeline->createGGroup<GRegion>({
-        pipeline->createGNode<MyNode1>(GNodeInfo({},"nodeB1", 1)),
+        pipeline->createGNode<MyNode1>(GNodeInfo({}, "nodeB1", 1)),
         pipeline->createGNode<MyNode2>(GNodeInfo({}, "nodeB2", 2))
     });
 
