From 9cca8548da36e2d6efc9a0e56d7391ce04335da6 Mon Sep 17 00:00:00 2001
From: chenming <chenming48@huawei.com>
Date: Sun, 13 Feb 2022 16:34:09 +0800
Subject: [PATCH] fix stop bugfix and add code review

Signed-off-by: chenming <chenming48@huawei.com>
---
 .../extension/src/js_work_scheduler_extension.cpp  |  6 ++----
 services/native/include/work_policy_manager.h      |  1 -
 services/native/src/work_conn_manager.cpp          |  2 +-
 services/native/src/work_policy_manager.cpp        | 14 --------------
 4 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/frameworks/extension/src/js_work_scheduler_extension.cpp b/frameworks/extension/src/js_work_scheduler_extension.cpp
index da856b1..9eb360b 100644
--- a/frameworks/extension/src/js_work_scheduler_extension.cpp
+++ b/frameworks/extension/src/js_work_scheduler_extension.cpp
@@ -85,9 +85,8 @@ void JsWorkSchedulerExtension::Init(const std::shared_ptr<AppExecFwk::AbilityLoc
 
 void JsWorkSchedulerExtension::OnStart(const AAFwk::Want& want)
 {
+    WS_HILOGI("JsWorkSchedulerExtension OnStart begin");
     AbilityRuntime::Extension::OnStart(want);
-    WS_HILOGI("WorkSchedulerExtension %{public}s begin.", __func__);
-    WS_HILOGI("WorkSchedulerExtension %{public}s end.", __func__);
 }
 
 void JsWorkSchedulerExtension::OnStop()
@@ -108,9 +107,8 @@ sptr<IRemoteObject> JsWorkSchedulerExtension::OnConnect(const AAFwk::Want& want)
 
 void JsWorkSchedulerExtension::OnDisconnect(const AAFwk::Want& want)
 {
-    AbilityRuntime::Extension::OnDisconnect(want);
     WS_HILOGI("WorkSchedulerExtension %{public}s begin.", __func__);
-    WS_HILOGI("WorkSchedulerExtension %{public}s end.", __func__);
+    AbilityRuntime::Extension::OnDisconnect(want);
 }
 
 void JsWorkSchedulerExtension::OnWorkStart()
diff --git a/services/native/include/work_policy_manager.h b/services/native/include/work_policy_manager.h
index 94de050..d23bce4 100644
--- a/services/native/include/work_policy_manager.h
+++ b/services/native/include/work_policy_manager.h
@@ -46,7 +46,6 @@ public:
     bool AddWork(std::shared_ptr<WorkStatus> workStatus, int32_t uid);
     bool RemoveWork(std::shared_ptr<WorkStatus> workStatus, int32_t uid);
     bool StopWork(std::shared_ptr<WorkStatus> workStatus, int32_t uid, const bool needCancel, bool isTimeOut);
-    bool CancelWork(std::shared_ptr<WorkStatus> workStatus, int32_t uid);
     bool StopAndClearWorks(int32_t uid);
     bool IsLastWorkTimeout(int32_t workId, int32_t uid);
     std::shared_ptr<WorkStatus> FindWorkStatus(WorkInfo& workInfo, int32_t uid);
diff --git a/services/native/src/work_conn_manager.cpp b/services/native/src/work_conn_manager.cpp
index 80c8089..7597e79 100644
--- a/services/native/src/work_conn_manager.cpp
+++ b/services/native/src/work_conn_manager.cpp
@@ -43,7 +43,7 @@ void WorkConnManager::RemoveConnInfo(string &workId)
 sptr<WorkSchedulerConnection> WorkConnManager::GetConnInfo(string &workId)
 {
     std::lock_guard<std::mutex> lock(connMapMutex_);
-    if (connMap_.count(workId) >= 0) {
+    if (connMap_.count(workId) > 0) {
         return connMap_.at(workId);
     }
     return nullptr;
diff --git a/services/native/src/work_policy_manager.cpp b/services/native/src/work_policy_manager.cpp
index 6ad5e01..49d674d 100644
--- a/services/native/src/work_policy_manager.cpp
+++ b/services/native/src/work_policy_manager.cpp
@@ -169,20 +169,6 @@ bool WorkPolicyManager::StopWork(std::shared_ptr<WorkStatus> workStatus, int32_t
     return hasCanceled;
 }
 
-bool WorkPolicyManager::CancelWork(shared_ptr<WorkStatus> workStatus, int32_t uid)
-{
-    WS_HILOGI("WorkPolicyManager::CancelWork");
-    std::lock_guard<std::mutex> lock(uidMapMutex_);
-    if (uidQueueMap_.count(uid) > 0) {
-        bool ret = uidQueueMap_.at(uid)->Remove(workStatus);
-        if (uidQueueMap_.at(uid)->GetSize() <= 0) {
-            uidQueueMap_.erase(uid);
-        }
-        return ret;
-    }
-    return true;
-}
-
 bool WorkPolicyManager::StopAndClearWorks(int32_t uid)
 {
     WS_HILOGI("WorkPolicyManager::StopAndClearWorks");
-- 
Gitee