diff --git a/js_concurrent_module/taskpool/test/test.cpp b/js_concurrent_module/taskpool/test/test.cpp index cd2aeffb35ebb6fea4a3935cf8de398dbd72603d..f7f3ccff2e4c3ccc34f3974f1d82ce582f6d32da 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(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 b5c782784712ea35a82296a6bb93897ed1acdc27..27be6e00910ccf461ee3bf61f86903a26a115b51 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 lock(currentTaskIdMutex_); diff --git a/js_concurrent_module/taskpool/worker.h b/js_concurrent_module/taskpool/worker.h index 97850b34316b7a55cc6304548dc32592088bff50..1b07e4396f2c321229a5cfd58c9d2ed6d49874f5 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;