From e0b2aa57ab967f9b7683db44485b06bfd465decb Mon Sep 17 00:00:00 2001 From: chenming Date: Tue, 22 Feb 2022 15:32:38 +0800 Subject: [PATCH] =?UTF-8?q?codex=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenming --- frameworks/include/work_info.h | 2 +- frameworks/src/work_info.cpp | 2 +- services/native/include/work_queue_manager.h | 4 ++-- services/native/src/policy/memory_policy.cpp | 2 +- services/native/src/work_queue_manager.cpp | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frameworks/include/work_info.h b/frameworks/include/work_info.h index 72206e5..f1a773e 100644 --- a/frameworks/include/work_info.h +++ b/frameworks/include/work_info.h @@ -39,7 +39,7 @@ public: void RequestBatteryLevel(int32_t battLevel); void RequestBatteryStatus(WorkCondition::BatteryStatus condition); void RequestStorageLevel(WorkCondition::Storage condition); - void RequestRepeatCycle(uint32_t timeInterval, uint32_t cycle); + void RequestRepeatCycle(uint32_t timeInterval, int32_t cycle); void RequestRepeatCycle(uint32_t timeInterval); void RefreshUid(int32_t uid); int32_t GetUid(); diff --git a/frameworks/src/work_info.cpp b/frameworks/src/work_info.cpp index 31a5619..9042ee0 100644 --- a/frameworks/src/work_info.cpp +++ b/frameworks/src/work_info.cpp @@ -81,7 +81,7 @@ void WorkInfo::RequestStorageLevel(WorkCondition::Storage condition) conditionMap_.emplace(WorkCondition::Type::STORAGE, storageCondition); } -void WorkInfo::RequestRepeatCycle(uint32_t timeInterval, uint32_t cycle) +void WorkInfo::RequestRepeatCycle(uint32_t timeInterval, int32_t cycle) { std::shared_ptr repeatCycle = std::make_shared(); repeatCycle->uintVal = timeInterval; diff --git a/services/native/include/work_queue_manager.h b/services/native/include/work_queue_manager.h index 0c0e23c..df33cee 100644 --- a/services/native/include/work_queue_manager.h +++ b/services/native/include/work_queue_manager.h @@ -43,7 +43,7 @@ public: void OnConditionChanged(WorkCondition::Type conditionType, std::shared_ptr conditionVal); bool StopAndClearWorks(std::list> workList); - void SetTimeCycle(int time); + void SetTimeCycle(uint32_t time); int GetTimeCycle(); void Dump(std::string& result); @@ -55,7 +55,7 @@ private: std::map> queueMap_; std::map> listenerMap_; - int timeCycle_; + uint32_t timeCycle_; }; } // namespace WorkScheduler } // namespace OHOS diff --git a/services/native/src/policy/memory_policy.cpp b/services/native/src/policy/memory_policy.cpp index b26d3b1..f1b0c97 100644 --- a/services/native/src/policy/memory_policy.cpp +++ b/services/native/src/policy/memory_policy.cpp @@ -54,7 +54,7 @@ int32_t MemoryPolicy::GetMemAvailable() char name[NAME_SIZE]; int32_t value = -1; while (fgets(buf, buff_len, fp) != NULL) { - sscanf(buf, "%s%d", name, &value); + sscanf_s(buf, "%s%d", name, sizeof(name), &value); string sname = name; if (sname.find(mem_name) != string::npos) { memAvailable = value; diff --git a/services/native/src/work_queue_manager.cpp b/services/native/src/work_queue_manager.cpp index 5828d53..1cb30e1 100644 --- a/services/native/src/work_queue_manager.cpp +++ b/services/native/src/work_queue_manager.cpp @@ -18,7 +18,7 @@ using namespace std; namespace OHOS { namespace WorkScheduler { -const int TIME_CYCLE = 20 * 60 * 1000; // 20min +const uint32_t TIME_CYCLE = 20 * 60 * 1000; // 20min WorkQueueManager::WorkQueueManager(const wptr& wss) : wss_(wss) { @@ -140,7 +140,7 @@ void WorkQueueManager::Dump(string& result) } } -void WorkQueueManager::SetTimeCycle(int time) +void WorkQueueManager::SetTimeCycle(uint32_t time) { timeCycle_ = time; } -- Gitee