[perf] optimise UTask, change some tests

ChunelFeng · Jan 14, 2024 · 893b53e · 893b53e
1 parent 7542a71
commit 893b53e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/CGraph-ninja-build.sh b/CGraph-ninja-build.sh
diff --git a/src/UtilsCtrl/ThreadPool/Task/UTask.h b/src/UtilsCtrl/ThreadPool/Task/UTask.h
@@ -29,7 +29,7 @@ class UTask : public UThreadObject {
     struct TaskDerided : TaskBased {
         T func_;
         explicit TaskDerided(F&& func) : func_(std::forward<F>(func)) {}
-        CVoid call() override { func_(); }
+        CVoid call() final { func_(); }
     };
 
 public:
@@ -39,9 +39,8 @@ class UTask : public UThreadObject {
         , priority_(priority) {}
 
     CVoid operator()() {
-        if (likely(impl_)) {
-            impl_->call();
-        }
+        // impl_ 理论上不可能为空
+        impl_ ? impl_->call() : throw CException("UTask inner function is nullptr");
     }
 
     UTask() = default;

diff --git a/test/Performance/test-performance-01.cpp b/test/Performance/test-performance-01.cpp
@@ -22,7 +22,7 @@ void test_performance_01() {
     config.max_thread_size_ = 8;
     config.primary_thread_policy_ = CGRAPH_THREAD_SCHED_RR;
     config.primary_thread_priority_ = 10;
-    config.primary_thread_empty_interval_ = 1;
+    config.primary_thread_empty_interval_ = 0;
     config.primary_thread_busy_epoch_ = 500;
     config.monitor_enable_ = false;    // 关闭扩缩容机制
     pipeline->setUniqueThreadPoolConfig(config);

diff --git a/test/Performance/test-performance-03.cpp b/test/Performance/test-performance-03.cpp
@@ -20,7 +20,7 @@ void test_performance_03() {
     config.secondary_thread_size_ = 0;
     config.max_task_steal_range_ = 1;
     config.max_thread_size_ = 2;
-    config.primary_thread_empty_interval_ = 1;
+    config.primary_thread_empty_interval_ = 0;
     config.primary_thread_busy_epoch_ = 500;
     config.monitor_enable_ = false;    // 关闭扩缩容机制
     config.primary_thread_policy_ = CGRAPH_THREAD_SCHED_RR;