From db7442c875ba2f93bdf2f0d754dcd90cb494cffc Mon Sep 17 00:00:00 2001 From: chaos_xj Date: Thu, 22 Jan 2026 10:08:38 +0800 Subject: [PATCH] fix5 Signed-off-by: chaos ` --- utils/include/ffrt_timer.h | 2 +- utils/src/task_sequence_process.cpp | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/utils/include/ffrt_timer.h b/utils/include/ffrt_timer.h index 1fc7bc6680..7fc1ae0c12 100644 --- a/utils/include/ffrt_timer.h +++ b/utils/include/ffrt_timer.h @@ -49,7 +49,7 @@ public: void StartOneShotTimer(uint64_t interval, void *data, void (*taskFun)(void *)) { - StopPro(); + StopTimer(); timer_ = ffrt_timer_start(ffrt_qos_default, interval, data, taskFun, false); } diff --git a/utils/src/task_sequence_process.cpp b/utils/src/task_sequence_process.cpp index 886fbd99d9..51a0f02beb 100644 --- a/utils/src/task_sequence_process.cpp +++ b/utils/src/task_sequence_process.cpp @@ -26,14 +26,13 @@ constexpr uint64_t DEFAULT_TASK_SN = 0; constexpr uint32_t DEFAULT_QUEUE_SIZE = 1; constexpr uint32_t DEFAULT_QUEUE_NUMBER = 1; -TaskSequenceProcess::TaskSequenceProcess(uint32_t maxQueueSize, uint64_t maxTimeInterval, std::string timerName) +TaskSequenceProcess::TaskSequenceProcess(uint32_t maxQueueSize, uint64_t maxTimeInterval) : maxQueueSize_(maxQueueSize), maxTimeInterval_(maxTimeInterval) { maxQueueSize_ = std::max(DEFAULT_QUEUE_SIZE, maxQueueSize); } -TaskSequenceProcess::TaskSequenceProcess(uint32_t maxQueueSize, uint32_t maxQueueNumber, uint64_t maxTimeInterval, - std::string timerName) +TaskSequenceProcess::TaskSequenceProcess(uint32_t maxQueueSize, uint32_t maxQueueNumber, uint64_t maxTimeInterval) : maxQueueSize_(maxQueueSize), maxQueueNumber_(maxQueueNumber), maxTimeInterval_(maxTimeInterval) { maxQueueSize_ = std::max(DEFAULT_QUEUE_SIZE, maxQueueSize); @@ -66,7 +65,7 @@ bool TaskSequenceProcess::FindMinSnTaskQueueId(uint64_t& minSnTaskQueueId) std::function TaskSequenceProcess::PopFromQueue() { auto now = std::chrono::system_clock::now(); - uint64_t startTimeMs = std::chrono::time_point_cast(now.time_since_epoch()).count(); + uint64_t startTimeMs = std::chrono::duration_cast(now.time_since_epoch()).count(); std::lock_guard lock(taskQueueMapMutex_); if (taskRunningFlag_.load() && startTimeMs > currentTimeMs_ + maxTimeInterval_) { taskRunningFlag_.store(false); @@ -137,7 +136,7 @@ void TaskSequenceProcess::ExecTask() { std::function task = PopFromQueue(); auto now = std::chrono::system_clock::now(); - uint64_t currentTimeMs_ = std::chrono::time_point_cast(now.time_since_epoch()).count(); + uint64_t currentTimeMs_ = std::chrono::duration_cast(now.time_since_epoch()).count(); if (!task) { TLOGE(WmsLogTag::DMS, "task do not execute"); return;