From ba47f8c6d73abcca50d75e5d0ff11519cb8e84cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Tue, 29 Mar 2022 03:46:49 +0000 Subject: [PATCH] Description:Code quality cleanup. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I501YS; Signed-off-by: wuluofeng --- .../ability_lite/src/ability_scheduler.cpp | 40 +++++++++---------- .../src/ability_mgr_handler.cpp | 24 +++++------ .../src/ability_mission_record.cpp | 6 +-- .../abilitymgr_lite/src/ability_service.cpp | 2 - .../abilitymgr_lite/src/ability_worker.cpp | 4 +- .../src/task/ability_start_task.cpp | 6 +-- .../src/task/ability_stop_task.cpp | 6 +-- 7 files changed, 43 insertions(+), 45 deletions(-) diff --git a/frameworks/ability_lite/src/ability_scheduler.cpp b/frameworks/ability_lite/src/ability_scheduler.cpp index c273e87..f5de541 100644 --- a/frameworks/ability_lite/src/ability_scheduler.cpp +++ b/frameworks/ability_lite/src/ability_scheduler.cpp @@ -86,34 +86,34 @@ int32_t AbilityScheduler::AmsCallback(const IpcContext* context, void *ipcMsg, I } case SCHEDULER_ABILITY_LIFECYCLE: { int state = IpcIoPopInt32(data); - uint64_t token = IpcIoPopUint64(data); + uint64_t lifecycleToken = IpcIoPopUint64(data); int abilityType = IpcIoPopInt32(data); Want want = { nullptr, nullptr, nullptr, 0 }; if (!DeserializeWant(&want, data)) { result = SERIALIZE_ERROR; break; } - scheduler->PerformTransactAbilityState(want, state, token, abilityType); + scheduler->PerformTransactAbilityState(want, state, lifecycleToken, abilityType); break; } case SCHEDULER_ABILITY_CONNECT: { - uint64_t token = IpcIoPopUint64(data); + uint64_t connectToken = IpcIoPopUint64(data); Want want = { nullptr, nullptr, nullptr, 0 }; if (!DeserializeWant(&want, data)) { result = SERIALIZE_ERROR; break; } - scheduler->PerformConnectAbility(want, token); + scheduler->PerformConnectAbility(want, connectToken); break; } case SCHEDULER_ABILITY_DISCONNECT: { - uint64_t token = IpcIoPopUint64(data); + uint64_t disconnectToken = IpcIoPopUint64(data); Want want = { nullptr, nullptr, nullptr, 0 }; if (!DeserializeWant(&want, data)) { result = SERIALIZE_ERROR; break; } - scheduler->PerformDisconnectAbility(want, token); + scheduler->PerformDisconnectAbility(want, disconnectToken); break; } case SCHEDULER_APP_EXIT: { @@ -126,8 +126,8 @@ int32_t AbilityScheduler::AmsCallback(const IpcContext* context, void *ipcMsg, I result = SERIALIZE_ERROR; break; } - uint64_t token = IpcIoPopUint64(data); - scheduler->PerformDumpAbility(want, token); + uint64_t dumpToken = IpcIoPopUint64(data); + scheduler->PerformDumpAbility(want, dumpToken); break; } default: { @@ -141,45 +141,45 @@ int32_t AbilityScheduler::AmsCallback(const IpcContext* context, void *ipcMsg, I void AbilityScheduler::PerformAppInit(const AppInfo &appInfo) { - auto task = [this, appInfo] { + auto initTask = [this, appInfo] { scheduler_.PerformAppInit(appInfo); }; - eventHandler_.PostTask(task); + eventHandler_.PostTask(initTask); } void AbilityScheduler::PerformTransactAbilityState(const Want &want, int state, uint64_t token, int abilityType) { - auto task = [this, want, state, token, abilityType] { + auto stateTask = [this, want, state, token, abilityType] { scheduler_.PerformTransactAbilityState(want, state, token, abilityType); ClearWant(const_cast(&want)); }; - eventHandler_.PostTask(task); + eventHandler_.PostTask(stateTask); } void AbilityScheduler::PerformConnectAbility(const Want &want, uint64_t token) { - auto task = [this, want, token] { + auto ConnectTask = [this, want, token] { scheduler_.PerformConnectAbility(want, token); ClearWant(const_cast(&want)); }; - eventHandler_.PostTask(task); + eventHandler_.PostTask(ConnectTask); } void AbilityScheduler::PerformDisconnectAbility(const Want &want, uint64_t token) { - auto task = [this, want, token] { + auto disconnectTask = [this, want, token] { scheduler_.PerformDisconnectAbility(want, token); ClearWant(const_cast(&want)); }; - eventHandler_.PostTask(task); + eventHandler_.PostTask(disconnectTask); } void AbilityScheduler::PerformAppExit() { - auto task = [this] { + auto exitTask = [this] { scheduler_.PerformAppExit(); }; - eventHandler_.PostTask(task); + eventHandler_.PostTask(exitTask); } void AbilityScheduler::PerformDumpAbility(const Want &want, uint64_t token) @@ -191,11 +191,11 @@ void AbilityScheduler::PerformDumpAbility(const Want &want, uint64_t token) } BinderAcquire(want.sid->ipcContext, want.sid->handle); #endif - auto task = [this, want, token] { + auto dumpTask = [this, want, token] { scheduler_.PerformDumpAbility(want, token); ClearWant(const_cast(&want)); }; - eventHandler_.PostTask(task); + eventHandler_.PostTask(dumpTask); } void AbilityScheduler::ClearIpcMsg(void *ipcMsg) diff --git a/services/abilitymgr_lite/src/ability_mgr_handler.cpp b/services/abilitymgr_lite/src/ability_mgr_handler.cpp index 84900fa..2b8ed10 100644 --- a/services/abilitymgr_lite/src/ability_mgr_handler.cpp +++ b/services/abilitymgr_lite/src/ability_mgr_handler.cpp @@ -71,15 +71,15 @@ void AbilityMgrHandler::ServiceMsgProcess(const Request &request) break; } case AMS_CONNECT_ABILITY_DONE: { - auto transParam = reinterpret_cast(request.data); - ConnectAbilityDone(transParam); - delete transParam; + auto doneTransParam = reinterpret_cast(request.data); + ConnectAbilityDone(doneTransParam); + delete doneTransParam; break; } case AMS_DISCONNECT_ABILITY: { - auto transParam = reinterpret_cast(request.data); - DisconnectAbility(transParam); - delete transParam; + auto disTransParam = reinterpret_cast(request.data); + DisconnectAbility(disTransParam); + delete disTransParam; break; } case AMS_DISCONNECT_ABILITY_DONE: { @@ -95,9 +95,9 @@ void AbilityMgrHandler::ServiceMsgProcess(const Request &request) break; } case AMS_TERMINATE_APP: { - char *bundleName = reinterpret_cast(request.data); - TerminateApp(bundleName); - AdapterFree(bundleName); + char *terminateBundleName = reinterpret_cast(request.data); + TerminateApp(terminateBundleName); + AdapterFree(terminateBundleName); break; } case AMS_DUMP_ABILITY: { @@ -105,9 +105,9 @@ void AbilityMgrHandler::ServiceMsgProcess(const Request &request) break; } case AMS_RESTART_APP: { - char *bundleName = reinterpret_cast(request.data); - RestartApp(bundleName); - AdapterFree(bundleName); + char *restartBundleName = reinterpret_cast(request.data); + RestartApp(restartBundleName); + AdapterFree(restartBundleName); break; } default: { diff --git a/services/abilitymgr_lite/src/ability_mission_record.cpp b/services/abilitymgr_lite/src/ability_mission_record.cpp index 1f86087..5e8eaa4 100644 --- a/services/abilitymgr_lite/src/ability_mission_record.cpp +++ b/services/abilitymgr_lite/src/ability_mission_record.cpp @@ -119,7 +119,7 @@ void AbilityMissionRecord::RemovePageAbility(const PageAbilityRecord &target) { auto iterator = pageAbilityRecords_.begin(); while (iterator != pageAbilityRecords_.end()) { - PageAbilityRecord *oldRecord = *iterator; + PageAbilityRecord* oldRecord = *iterator; if (oldRecord != nullptr && oldRecord->IsSamePageAbility(target)) { break; } @@ -128,9 +128,9 @@ void AbilityMissionRecord::RemovePageAbility(const PageAbilityRecord &target) // remove from current to top of stack while (iterator != pageAbilityRecords_.end()) { - PageAbilityRecord* oldRecord = *iterator; + PageAbilityRecord* newRecord = *iterator; iterator = pageAbilityRecords_.erase(iterator); - delete oldRecord; + delete newRecord; } } diff --git a/services/abilitymgr_lite/src/ability_service.cpp b/services/abilitymgr_lite/src/ability_service.cpp index 2fd14b9..ca7b7e8 100644 --- a/services/abilitymgr_lite/src/ability_service.cpp +++ b/services/abilitymgr_lite/src/ability_service.cpp @@ -444,8 +444,6 @@ void AbilityService::DeleteRecordInfo(uint16_t token) osMessageQueueDelete(jsAppQueueId); auto jsAppHost = const_cast(record->GetJsAppHost()); delete jsAppHost; - // free all JS native memory after exiting it - // CleanTaskMem(taskId) } // record app info event when stop app RecordAbiityInfoEvt(record->GetAppName()); diff --git a/services/abilitymgr_lite/src/ability_worker.cpp b/services/abilitymgr_lite/src/ability_worker.cpp index 99bd700..c8ca41c 100644 --- a/services/abilitymgr_lite/src/ability_worker.cpp +++ b/services/abilitymgr_lite/src/ability_worker.cpp @@ -154,8 +154,8 @@ AbilityMsStatus AbilityWorker::ConnectAbility(const AbilityConnectTransParam &co } AbilityConnectTask connectTask(abilityMgrContext_, *connectParam.GetWant(), connectParam.GetSvcIdentity(), connectParam.GetToken()); - AbilityMsStatus status = connectTask.Execute(); - return status; + AbilityMsStatus executeStatus = connectTask.Execute(); + return executeStatus; } AbilityMsStatus AbilityWorker::DisconnectAbility(const SvcIdentity &identity, uint64_t token) diff --git a/services/abilitymgr_lite/src/task/ability_start_task.cpp b/services/abilitymgr_lite/src/task/ability_start_task.cpp index 0062b0f..c93fde8 100644 --- a/services/abilitymgr_lite/src/task/ability_start_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_start_task.cpp @@ -71,12 +71,12 @@ AbilityMsStatus AbilityStartTask::Execute() } // step4: Start ability. PRINTD("AbilityStartTask", "topAbility is nullptr or not active"); - AbilityMsStatus status = targetAbility->StartAbility(); - if (status.IsProcessError() || status.IsTransactError()) { + AbilityMsStatus startStatus = targetAbility->StartAbility(); + if (startStatus.IsProcessError() || startStatus.IsTransactError()) { // Clean page ability record if failure stackManager.RemovePageAbility(*targetAbility, *abilityMgrContext_); } - return status; + return startStatus; } AbilityMsStatus AbilityStartTask::StartService() diff --git a/services/abilitymgr_lite/src/task/ability_stop_task.cpp b/services/abilitymgr_lite/src/task/ability_stop_task.cpp index e3a17d4..7d7d277 100644 --- a/services/abilitymgr_lite/src/task/ability_stop_task.cpp +++ b/services/abilitymgr_lite/src/task/ability_stop_task.cpp @@ -53,15 +53,15 @@ AbilityMsStatus AbilityStopTask::Execute() return status; } else { // Step 2: Ability is bottom in MissionRecord - AbilityMsStatus status = AbilityMsStatus::Ok(); + AbilityMsStatus okStatus = AbilityMsStatus::Ok(); if (stopAbility->IsBottomPageAbility() && serviceConnects->CountServiceInApp(stopAbility->GetAbilityInfo().bundleName) == 0) { // exit process - status = stopAbility->ExitApp(); + okStatus = stopAbility->ExitApp(); } // Step 3: Delete ability from stack stackManager.RemovePageAbility(*stopAbility, *abilityMgrContext_); - return status; + return okStatus; } } } // namespace OHOS -- Gitee