From c2bfe53d0db99806b9feb45e8c93a7345f5fb2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Sat, 15 Feb 2025 15:39:07 +0800 Subject: [PATCH 1/2] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- .../source/collect/common_event_collect.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/services/samgr/native/source/collect/common_event_collect.cpp b/services/samgr/native/source/collect/common_event_collect.cpp index 17c15b55..b043b13c 100644 --- a/services/samgr/native/source/collect/common_event_collect.cpp +++ b/services/samgr/native/source/collect/common_event_collect.cpp @@ -357,14 +357,17 @@ int64_t CommonEventCollect::SaveOnDemandReasonExtraData(const EventFwk::CommonEv wantMap[UID] = std::to_string(uid); wantMap[NET_TYPE] = std::to_string(netType); wantMap[BUNDLE_NAME] = want.GetBundle(); - std::lock_guard autoLock(extraDataLock_); - wantMap[COMMON_EVENT_ACTION_NAME] = want.GetAction(); - OnDemandReasonExtraData extraData(data.GetCode(), data.GetData(), wantMap); + int64_t extraDataId = 0; + { + std::lock_guard autoLock(extraDataLock_); + wantMap[COMMON_EVENT_ACTION_NAME] = want.GetAction(); + OnDemandReasonExtraData extraData(data.GetCode(), data.GetData(), wantMap); - int64_t extraDataId = GenerateExtraDataIdLocked(); - extraDatas_[extraDataId] = extraData; - HILOGD("CommonEventCollect save extraData %{public}d,n:%{public}zu", - static_cast(extraDataId), extraDatas_.size()); + extraDataId = GenerateExtraDataIdLocked(); + extraDatas_[extraDataId] = extraData; + HILOGD("CommonEventCollect save extraData %{public}d,n:%{public}zu", + static_cast(extraDataId), extraDatas_.size()); + } if (workHandler_ == nullptr) { HILOGI("CommonEventCollect workHandler is nullptr"); return -1; -- Gitee From b9adc56cc4d4573e200755ce93996aa8e15dd7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=98=89=E5=AE=9D?= Date: Sat, 15 Feb 2025 15:42:19 +0800 Subject: [PATCH 2/2] commit msg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黄嘉宝 --- services/samgr/native/source/collect/common_event_collect.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/samgr/native/source/collect/common_event_collect.cpp b/services/samgr/native/source/collect/common_event_collect.cpp index b043b13c..b1eaf7bb 100644 --- a/services/samgr/native/source/collect/common_event_collect.cpp +++ b/services/samgr/native/source/collect/common_event_collect.cpp @@ -392,14 +392,14 @@ void CommonEventCollect::RemoveOnDemandReasonExtraData(int64_t extraDataId) std::lock_guard autoLock(extraDataLock_); extraDatas_.erase(extraDataId); } - HILOGD("CommonEventCollect remove extraData %{public}d", static_cast(extraDataId)); + HILOGI("CommonEventCollect remove extraData %{public}d", static_cast(extraDataId)); RemoveSaExtraDataId(extraDataId); } bool CommonEventCollect::GetOnDemandReasonExtraData(int64_t extraDataId, OnDemandReasonExtraData& extraData) { std::lock_guard autoLock(extraDataLock_); - HILOGD("CommonEventCollect get extraData %{public}d", static_cast(extraDataId)); + HILOGI("CommonEventCollect get extraData %{public}d", static_cast(extraDataId)); if (extraDatas_.count(extraDataId) == 0) { return false; } -- Gitee