openharmony/ability_dmsfwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_dmsfwk synced 2024-11-23 06:20:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!815 [优化]:DMS日志整改4.0Release

Browse Source 
Merge pull request !815 from 师皓杰/OpenHarmony-4.0-Release
This commit is contained in:
openharmony_ci 2024-03-14 03:40:08 +00:00 committed by Gitee
commit c67571f51e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
services/dtbschedmgr/src/distributed_sched_stub.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
* Copyright (c) 2021-2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@ -171,7 +171,7 @@ int32_t DistributedSchedStub::OnRemoteRequest(uint32_t code,
MessageParcel& data, MessageParcel& reply, MessageOption& option)
{
bool IsLocalCalling = IPCSkeleton::IsLocalCalling();
HILOGI("OnRemoteRequest, code = %{public}d, flags = %{public}d, IsLocalCalling = %{public}d.",
HILOGI("OnRemoteRequest, code = %{public}u, flags = %{public}d, IsLocalCalling = %{public}d.",
code, option.GetFlags(), IsLocalCalling);
const auto& funcsMap = IsLocalCalling ? localFuncsMap_ : remoteFuncsMap_;

4
services/dtbschedmgr/src/mission/distributed_mission_broadcast_listener.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@ -26,7 +26,7 @@ const std::string TAG = "DistributedMissionBroadcastListener";
}
void DistributedMissionBroadcastListener::OnDataRecv(std::string& senderNetworkId, uint8_t* payload, uint32_t dataLen)
{
HILOGI("OnDataRecv, dataLen = %{public}d", dataLen);
HILOGI("OnDataRecv, dataLen = %{public}u", dataLen);
DistributedSchedContinueManager::GetInstance().NotifyDataRecv(senderNetworkId, payload, dataLen);
}
} // namespace DistributedSchedule

18
services/dtbschedmgr/src/mission/distributed_sched_continue_manager.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2023 Huawei Device Co., Ltd.
* Copyright (c) 2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@ -106,16 +106,16 @@ void DistributedSchedContinueManager::NotifyMissionUnfocused(const int32_t missi
void DistributedSchedContinueManager::NotifyDataRecv(std::string& senderNetworkId, uint8_t* payload, uint32_t dataLen)
{
HILOGI("NotifyDataRecv start, senderNetworkId: %{public}s, dataLen: %{public}d",
HILOGI("NotifyDataRecv start, senderNetworkId: %{public}s, dataLen: %{public}u",
DnetworkAdapter::AnonymizeNetworkId(senderNetworkId).c_str(), dataLen);
if (dataLen != DMS_SEND_LEN) {
HILOGE("dataLen error, dataLen: %{public}d", dataLen);
HILOGE("dataLen error, dataLen: %{public}u", dataLen);
return;
}
uint8_t type = (payload[0] & DMS_0XF0) >> CONTINUE_SHIFT_04;
uint8_t len = payload[0] & DMS_0X0F;
if (len != sizeof(uint32_t) || (type != DMS_UNFOCUSED_TYPE && type != DMS_FOCUSED_TYPE)) {
HILOGE("len or type error, len: %{public}d, type: %{public}d", len, type);
HILOGE("len or type error, len: %{public}u, type: %{public}u", len, type);
return;
}
uint32_t accessTokenId = payload[1] << CONTINUE_SHIFT_24 | payload[INDEX_2] << CONTINUE_SHIFT_16 |
@ -249,10 +249,10 @@ int32_t DistributedSchedContinueManager::DealFocusedBusiness(const int32_t missi
uint32_t accessTokenId;
ret = BundleManagerInternal::GetBundleIdFromBms(bundleName, accessTokenId);
if (ret != ERR_OK) {
HILOGE("get focused accessTokenId failed, accessTokenId: %{public}d, ret: %{public}d", accessTokenId, ret);
HILOGE("get focused accessTokenId failed, accessTokenId: %{public}u, ret: %{public}d", accessTokenId, ret);
return ret;
}
HILOGE("get focused accessTokenId success, accessTokenId: %{public}d", accessTokenId);
HILOGE("get focused accessTokenId success, accessTokenId: %{public}u", accessTokenId);
uint32_t sendDataLen = DMS_SEND_LEN;
uint8_t data[DMS_SEND_LEN];
uint8_t type = DMS_FOCUSED_TYPE;
@ -313,7 +313,7 @@ int32_t DistributedSchedContinueManager::DealUnfocusedBusiness(const int32_t mis
uint32_t accessTokenId;
ret = BundleManagerInternal::GetBundleIdFromBms(bundleName, accessTokenId);
if (ret != ERR_OK) {
HILOGE("get unfocused accessTokenId failed, accessTokenId: %{public}d, ret: %{public}d", accessTokenId, ret);
HILOGE("get unfocused accessTokenId failed, accessTokenId: %{public}u, ret: %{public}d", accessTokenId, ret);
return ret;
}
uint32_t sendDataLen = DMS_SEND_LEN;
@ -475,7 +475,7 @@ int32_t DistributedSchedContinueManager::DealSetMissionContinueStateBusiness(con
uint32_t accessTokenId;
ret = BundleManagerInternal::GetBundleIdFromBms(bundleName, accessTokenId);
if (ret != ERR_OK) {
HILOGE("get setContinueState accessTokenId failed, accessTokenId: %{public}d, ret: %{public}d",
HILOGE("get setContinueState accessTokenId failed, accessTokenId: %{public}u, ret: %{public}d",
accessTokenId, ret);
return ret;
}
@ -494,7 +494,7 @@ int32_t DistributedSchedContinueManager::DealSetMissionContinueStateBusiness(con
data[INDEX_4] = accessTokenId & DMS_0XFF;
ret = SoftbusAdapter::GetInstance().SendSoftbusEvent(data, sendDataLen);
if (ret != ERR_OK) {
HILOGE("SendSoftbusEvent setContinueState failed, sendDataLen: %{public}d, ret: %{public}d", sendDataLen, ret);
HILOGE("SendSoftbusEvent setContinueState failed, sendDataLen: %{public}u, ret: %{public}d", sendDataLen, ret);
return ret;
}