From 901407b52d94e27f1c58f7a5112fe10959b1ae63 Mon Sep 17 00:00:00 2001
From: zhouwenxuan <zhouwenxuan1@huawei.com>
Date: Fri, 18 Apr 2025 12:05:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=91=E7=B9=81=E5=88=87qos=EF=BC=8Cqos?=
 =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E6=9C=89=E4=B8=AA=E8=BF=9B=E7=A8=8B=E9=94=81?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E4=B8=BB=E7=BA=BF=E7=A8=8B=E5=8D=A1?=
 =?UTF-8?q?=E9=A1=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Issue: https://gitee.com/openharmony/commonlibrary_ets_utils/issues/IC1R58

Signed-off-by: zhouwenxuan <zhouwenxuan1@huawei.com>
Change-Id: I1465e8e8ac0e0cf351e74f9e7a3d363a7b2e0b67
---
 js_concurrent_module/taskpool/test/test.cpp |  2 --
 js_concurrent_module/taskpool/worker.cpp    | 17 -----------------
 js_concurrent_module/taskpool/worker.h      |  5 +----
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/js_concurrent_module/taskpool/test/test.cpp b/js_concurrent_module/taskpool/test/test.cpp
index cd2aeffb..f7f3ccff 100755
--- a/js_concurrent_module/taskpool/test/test.cpp
+++ b/js_concurrent_module/taskpool/test/test.cpp
@@ -853,11 +853,9 @@ void NativeEngineTest::TaskResultCallback(napi_env env)
     Worker::TaskResultCallback(worker->workerEnv_, nullptr, true, reinterpret_cast<void*>(task));
 
     worker->priority_ = Priority::LOW;
-    worker->ResetWorkerPriority();
     TaskManager& taskManager = TaskManager::GetInstance();
     taskManager.globalEnableFfrtFlag_ = true;
     worker->priority_ = Priority::HIGH;
-    worker->ResetWorkerPriority();
     taskManager.globalEnableFfrtFlag_ = false;
     worker->state_ = WorkerState::BLOCKED;
     worker->UpdateExecutedInfo();
diff --git a/js_concurrent_module/taskpool/worker.cpp b/js_concurrent_module/taskpool/worker.cpp
index b5c78278..27be6e00 100644
--- a/js_concurrent_module/taskpool/worker.cpp
+++ b/js_concurrent_module/taskpool/worker.cpp
@@ -581,23 +581,6 @@ void Worker::TaskResultCallback(napi_env env, napi_value result, bool success, v
     NotifyTaskResult(env, task, result);
 }
 
-// reset qos_user_initiated after perform task
-void Worker::ResetWorkerPriority()
-{
-    if (priority_ != Priority::HIGH) {
-        if (TaskManager::GetInstance().EnableFfrt()) {
-#if defined(ENABLE_TASKPOOL_FFRT)
-            if (ffrt::this_task::update_qos(WORKERPRIORITY_FFRTQOS_MAP.at(Priority::HIGH)) != 0) {
-                SetWorkerPriority(Priority::HIGH);
-            }
-#endif
-        } else {
-            SetWorkerPriority(Priority::HIGH);
-        }
-        priority_ = Priority::HIGH;
-    }
-}
-
 void Worker::StoreTaskId(uint32_t taskId)
 {
     std::lock_guard<std::mutex> lock(currentTaskIdMutex_);
diff --git a/js_concurrent_module/taskpool/worker.h b/js_concurrent_module/taskpool/worker.h
index 97850b34..1b07e439 100644
--- a/js_concurrent_module/taskpool/worker.h
+++ b/js_concurrent_module/taskpool/worker.h
@@ -147,10 +147,7 @@ private:
     class PriorityScope {
     public:
         PriorityScope(Worker* worker, Priority taskPriority);
-        ~PriorityScope()
-        {
-            worker_->ResetWorkerPriority();
-        }
+        ~PriorityScope() = default;
 
     private:
         Worker* worker_ = nullptr;
-- 
Gitee