openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-27 17:31:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1413 日志优化需求

Browse Source 
Merge pull request !1413 from jerry/master
This commit is contained in:
openharmony_ci 2022-03-30 06:17:37 +00:00 committed by Gitee
commit 561d0ad611
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frameworks/kits/content/cpp/src/ohos/aafwk/content/operation.cpp
View File

@ -373,8 +373,6 @@ void Operation::SetEntities(const std::vector<std::string> &entities)
void Operation::DumpInfo(int level) const
{
ABILITYBASE_LOGI("=======Operation::DumpInfo level: %{public}d start=============", level);
ABILITYBASE_LOGI("===Operation::abilityName_ %{public}s =============", abilityName_.c_str());
ABILITYBASE_LOGI("===Operation::action_ %{public}s =============", action_.c_str());
ABILITYBASE_LOGI("===Operation::bundleName_ %{public}s =============", bundleName_.c_str());
@ -386,8 +384,6 @@ void Operation::DumpInfo(int level) const
}
ABILITYBASE_LOGI("===Operation::flags_ %{public}ud =============", flags_);
ABILITYBASE_LOGI("===Operation::uri_ %{public}s =============", uri_.ToString().c_str());
ABILITYBASE_LOGI("=======Operation::DumpInfo level: %{public}d end=============", level);
}
} // namespace AAFwk
} // namespace OHOS

2
frameworks/kits/content/cpp/src/ohos/aafwk/content/want.cpp
View File

@ -1923,14 +1923,12 @@ bool Want::CheckAndSetParameters(Want &want, const std::string &key, std::string
void Want::DumpInfo(int level) const
{
ABILITYBASE_LOGI("==================Want::DumpInfo level: %{public}d start=============", level);
operation_.DumpInfo(level);
parameters_.DumpInfo(level);
if (picker_ != nullptr) {
picker_->DumpInfo(level + 1);
}
ABILITYBASE_LOGI("==================Want::DumpInfo level: %{public}d end=============", level);
}
nlohmann::json Want::ToJson() const

10
interfaces/kits/napi/aafwk/inner/napi_common/napi_common_ability.cpp
View File

@ -56,20 +56,17 @@ bool& GetDataAbilityHelperStatus()
bool CheckAbilityType(AbilityType typeInAbility, AbilityType typeWant)
{
HILOG_INFO("%{public}s called.", __func__);
switch (typeWant) {
case AbilityType::PAGE:
return typeInAbility == AbilityType::PAGE;
default:
return typeInAbility != AbilityType::PAGE;
}
HILOG_INFO("%{public}s end.", __func__);
return false;
}
bool CheckAbilityType(const CBBase *cbBase)
{
HILOG_INFO("%{public}s called.", __func__);
if (cbBase == nullptr) {
HILOG_ERROR("%{public}s cbBase == nullptr", __func__);
return false;
@ -85,7 +82,6 @@ bool CheckAbilityType(const CBBase *cbBase)
HILOG_ERROR("%{public}s info == nullptr", __func__);
return false;
}
HILOG_INFO("%{public}s end.", __func__);
return CheckAbilityType((AbilityType)info->type, cbBase->abilityType);
}
@ -136,7 +132,6 @@ bool CheckAbilityType(const AsyncCallbackInfo *asyncCallbackInfo)
void SaveAppInfo(AppInfo_ &appInfo, const ApplicationInfo &appInfoOrg)
{
HILOG_INFO("%{public}s.", __func__);
appInfo.name = appInfoOrg.name;
appInfo.description = appInfoOrg.description;
appInfo.descriptionId = appInfoOrg.descriptionId;
@ -158,7 +153,6 @@ void SaveAppInfo(AppInfo_ &appInfo, const ApplicationInfo &appInfoOrg)
appInfo.moduleInfos.emplace_back(appInfoOrg.moduleInfos.at(i));
}
appInfo.entryDir = appInfoOrg.entryDir;
HILOG_INFO("%{public}s end.", __func__);
}
napi_value GetContinueAbilityOptionsInfoCommon(
@ -2662,7 +2656,6 @@ napi_value GetWantWrap(napi_env env, napi_callback_info info, AsyncCallbackInfo
*/
napi_value NAPI_GetWantCommon(napi_env env, napi_callback_info info, AbilityType abilityType)
{
HILOG_INFO("%{public}s, called.", __func__);
AsyncCallbackInfo *asyncCallbackInfo = CreateAsyncCallbackInfo(env);
if (asyncCallbackInfo == nullptr) {
HILOG_ERROR("%{public}s, asyncCallbackInfo == nullptr", __func__);
@ -2680,7 +2673,6 @@ napi_value NAPI_GetWantCommon(napi_env env, napi_callback_info info, AbilityType
}
ret = WrapVoidToJS(env);
}
HILOG_INFO("%{public}s, end.", __func__);
return ret;
}
@ -4489,14 +4481,12 @@ napi_value NAPI_StartBackgroundRunningCommon(napi_env env, napi_callback_info in
void CancelBackgroundRunningExecuteCB(napi_env env, void *data)
{
HILOG_INFO("NAPI_PACancelBackgroundRunning, worker pool thread execute.");
AsyncCallbackInfo *asyncCallbackInfo = static_cast<AsyncCallbackInfo *>(data);
if (asyncCallbackInfo->ability != nullptr) {
asyncCallbackInfo->ability->StopBackgroundRunning();
} else {
HILOG_ERROR("NAPI_PACancelBackgroundRunning, ability == nullptr");
}
HILOG_INFO("NAPI_PACancelBackgroundRunning, worker pool thread execute end.");
}
napi_value CancelBackgroundRunningAsync(

8
interfaces/kits/napi/aafwk/inner/napi_common/napi_common_want.cpp
View File

@ -56,23 +56,20 @@ void InnerInitWantOptionsData(std::map<std::string, unsigned int> &flagMap)
napi_value WrapElementName(napi_env env, const ElementName &elementName)
{
HILOG_INFO("%{public}s called.", __func__);
HILOG_INFO("%{public}s called. DeviceID=%{public}s, BundleName=%{public}s, AbilityName=%{public}s", __func__,
elementName.GetDeviceID().c_str(), elementName.GetBundleName().c_str(), elementName.GetAbilityName().c_str());
napi_value jsObject = nullptr;
NAPI_CALL(env, napi_create_object(env, &jsObject));
napi_value jsValue = nullptr;
HILOG_INFO("%{public}s called. deviceID=%{public}s", __func__, elementName.GetDeviceID().c_str());
NAPI_CALL(env, napi_create_string_utf8(env, elementName.GetDeviceID().c_str(), NAPI_AUTO_LENGTH, &jsValue));
NAPI_CALL(env, napi_set_named_property(env, jsObject, "deviceId", jsValue));
jsValue = nullptr;
HILOG_INFO("%{public}s called. GetBundleName=%{public}s", __func__, elementName.GetBundleName().c_str());
NAPI_CALL(env, napi_create_string_utf8(env, elementName.GetBundleName().c_str(), NAPI_AUTO_LENGTH, &jsValue));
NAPI_CALL(env, napi_set_named_property(env, jsObject, "bundleName", jsValue));
jsValue = nullptr;
HILOG_INFO("%{public}s called. GetAbilityName=%{public}s", __func__, elementName.GetAbilityName().c_str());
NAPI_CALL(env, napi_create_string_utf8(env, elementName.GetAbilityName().c_str(), NAPI_AUTO_LENGTH, &jsValue));
NAPI_CALL(env, napi_set_named_property(env, jsObject, "abilityName", jsValue));
@ -524,7 +521,6 @@ bool InnerWrapWantParamsArray(napi_env env, napi_value jsObject, const std::stri
napi_value WrapWantParams(napi_env env, const AAFwk::WantParams &wantParams)
{
HILOG_INFO("%{public}s called.", __func__);
napi_value jsObject = nullptr;
NAPI_CALL(env, napi_create_object(env, &jsObject));

2
services/appmgr/src/app_mgr_service_inner.cpp
View File

@ -1196,7 +1196,6 @@ void AppMgrServiceInner::StateChangedNotifyObserver(const AbilityStateData abili
void AppMgrServiceInner::OnProcessCreated(const std::shared_ptr<AppRunningRecord> &appRecord)
{
HILOG_DEBUG("OnProcessCreated begin.");
if (!appRecord) {
HILOG_ERROR("app record is null");
return;
@ -1210,7 +1209,6 @@ void AppMgrServiceInner::OnProcessCreated(const std::shared_ptr<AppRunningRecord
observer->OnProcessCreated(data);
}
}
HILOG_DEBUG("end");
}
void AppMgrServiceInner::OnProcessDied(const std::shared_ptr<AppRunningRecord> &appRecord)

8
services/appmgr/src/app_spawn_msg_wrapper.cpp
View File

@ -115,13 +115,7 @@ void AppSpawnMsgWrapper::DumpMsg() const
return;
}
HILOG_INFO("************AppSpawnMsg*************");
HILOG_INFO("uid: %{public}d", msg_->uid);
HILOG_INFO("gid: %{public}d", msg_->gid);
for (uint32_t i = 0; i < msg_->gidCount; ++i) {
HILOG_INFO("gidTable[%{public}d]: %{public}d", i, msg_->gidTable[i]);
}
HILOG_INFO("procName: %{public}s", msg_->processName);
HILOG_INFO("soPath: %{private}s", msg_->soPath);
HILOG_INFO("uid: %{public}d, gid: %{public}d, procName: %{public}s", msg_->uid, msg_->gid, msg_->processName);
HILOG_INFO("************************************");
}