diff --git a/services/packageusage/src/bundle_active_report_handler.cpp b/services/packageusage/src/bundle_active_report_handler.cpp index 8a3b2265d4c9558d22182927a7b6c7c1e488c217..7b6497acffa5883682f842579a3687ba5615f48b 100644 --- a/services/packageusage/src/bundle_active_report_handler.cpp +++ b/services/packageusage/src/bundle_active_report_handler.cpp @@ -34,17 +34,16 @@ void BundleActiveReportHandler::ProcessEvent(const AppExecFwk::InnerEvent::Point BUNDLE_ACTIVE_LOGE("event is null, exit ProcessEvent"); return; } + auto ptrToHandlerobj = event->GetSharedObject(); switch (event->GetInnerEventId()) { case MSG_REPORT_EVENT: { BUNDLE_ACTIVE_LOGI("MSG_REPORT_EVENT CALLED"); - auto ptrToHandlerobj = event->GetSharedObject(); BundleActiveReportHandlerObject tmpHandlerobj = *ptrToHandlerobj; bundleActiveCore_->ReportEvent(tmpHandlerobj.event_, tmpHandlerobj.userId_); break; } case MSG_FLUSH_TO_DISK: { BUNDLE_ACTIVE_LOGI("FLUSH TO DISK HANDLE"); - auto ptrToHandlerobj = event->GetSharedObject(); BundleActiveReportHandlerObject tmpHandlerobj = *ptrToHandlerobj; if (tmpHandlerobj.userId_ != bundleActiveCore_->currentUsedUser_) { BUNDLE_ACTIVE_LOGE("flush user is %{public}d, not last user %{public}d, return", @@ -56,21 +55,18 @@ void BundleActiveReportHandler::ProcessEvent(const AppExecFwk::InnerEvent::Point break; } case MSG_REMOVE_USER: { - auto ptrToHandlerobj = event->GetSharedObject(); BundleActiveReportHandlerObject tmpHandlerobj = *ptrToHandlerobj; bundleActiveCore_->OnUserRemoved(tmpHandlerobj.userId_); break; } case MSG_BUNDLE_UNINSTALLED: { BUNDLE_ACTIVE_LOGI("MSG_BUNDLE_UNINSTALLED CALLED"); - auto ptrToHandlerobj = event->GetSharedObject(); BundleActiveReportHandlerObject tmpHandlerobj = *ptrToHandlerobj; bundleActiveCore_->OnBundleUninstalled(tmpHandlerobj.userId_, tmpHandlerobj.bundleName_); break; } case MSG_SWITCH_USER: { BUNDLE_ACTIVE_LOGI("MSG_SWITCH_USER CALLED"); - auto ptrToHandlerobj = event->GetSharedObject(); BundleActiveReportHandlerObject tmpHandlerobj = *ptrToHandlerobj; bundleActiveCore_->OnUserSwitched(tmpHandlerobj.userId_); break; diff --git a/utils/include/bundle_active_log.h b/utils/include/bundle_active_log.h index 68f5282b1f3b2f251653d70110f42b475c0c40a4..22fc8b752898b18246312f86fa238b31ed6a1595 100644 --- a/utils/include/bundle_active_log.h +++ b/utils/include/bundle_active_log.h @@ -21,19 +21,11 @@ namespace OHOS { namespace DeviceUsageStats { -#ifndef LOG_TAG_DOMAIN_ID_BUNDLE_ACTIVE -#define LOG_TAG_DOMAIN_ID_BUNDLE_ACTIVE 0xD001710 -#endif +#undef LOG_DOMAIN +#define LOG_DOMAIN 0xD001710 -#ifndef LOG_TAG_BUNDLE_ACTIVE -#define LOG_TAG_BUNDLE_ACTIVE "BUNDLE_ACTIVE" -#endif - -static constexpr OHOS::HiviewDFX::HiLogLabel BUNDLE_ACTIVE_LOG_LABEL = { - LOG_CORE, - LOG_TAG_DOMAIN_ID_BUNDLE_ACTIVE, - LOG_TAG_BUNDLE_ACTIVE -}; +#undef LOG_TAG +#define LOG_TAG "BUNDLE_ACTIVE" enum class BundleActiveLogLevel : uint8_t { DEBUG = 0, INFO, WARN, ERROR, FATAL }; @@ -60,20 +52,16 @@ private: static BundleActiveLogLevel logLevel_; }; -#define BUNDLE_ACTIVE_PRINT_LOG(LEVEL, Level, fmt, ...) \ - if (BundleActiveLog::JudgeValidLevel(BundleActiveLogLevel::LEVEL)) \ - OHOS::HiviewDFX::HiLog::Level(BUNDLE_ACTIVE_LOG_LABEL, \ - "[%{public}s(%{public}s):%{public}d] " fmt, \ - BundleActiveLog::GetCurrFileName(__FILE__).c_str(), \ - __FUNCTION__, \ - __LINE__, \ - ##__VA_ARGS__) - -#define BUNDLE_ACTIVE_LOGD(fmt, ...) BUNDLE_ACTIVE_PRINT_LOG(DEBUG, Debug, fmt, ##__VA_ARGS__) -#define BUNDLE_ACTIVE_LOGI(fmt, ...) BUNDLE_ACTIVE_PRINT_LOG(INFO, Info, fmt, ##__VA_ARGS__) -#define BUNDLE_ACTIVE_LOGW(fmt, ...) BUNDLE_ACTIVE_PRINT_LOG(WARN, Warn, fmt, ##__VA_ARGS__) -#define BUNDLE_ACTIVE_LOGE(fmt, ...) BUNDLE_ACTIVE_PRINT_LOG(ERROR, Error, fmt, ##__VA_ARGS__) -#define BUNDLE_ACTIVE_LOGF(fmt, ...) BUNDLE_ACTIVE_PRINT_LOG(FATAL, Fatal, fmt, ##__VA_ARGS__) +#define BUNDLE_ACTIVE_LOGD(fmt, ...) HILOG_DEBUG(LOG_CORE, "[%{public}s(%{public}s):%{public}d]" fmt, \ + BundleActiveLog::GetCurrFileName(__FILE__).c_str(), __FUNCTION__, __LINE__, ##__VA_ARGS__) +#define BUNDLE_ACTIVE_LOGI(fmt, ...) HILOG_INFO(LOG_CORE, "[%{public}s(%{public}s):%{public}d]" fmt, \ + BundleActiveLog::GetCurrFileName(__FILE__).c_str(), __FUNCTION__, __LINE__, ##__VA_ARGS__) +#define BUNDLE_ACTIVE_LOGW(fmt, ...) HILOG_WARN(LOG_CORE, "[%{public}s(%{public}s):%{public}d]" fmt, \ + BundleActiveLog::GetCurrFileName(__FILE__).c_str(), __FUNCTION__, __LINE__, ##__VA_ARGS__) +#define BUNDLE_ACTIVE_LOGE(fmt, ...) HILOG_ERROR(LOG_CORE, "[%{public}s(%{public}s):%{public}d]" fmt, \ + BundleActiveLog::GetCurrFileName(__FILE__).c_str(), __FUNCTION__, __LINE__, ##__VA_ARGS__) +#define BUNDLE_ACTIVE_LOGF(fmt, ...) HILOG_FATAL(LOG_CORE, "[%{public}s(%{public}s):%{public}d]" fmt, \ + BundleActiveLog::GetCurrFileName(__FILE__).c_str(), __FUNCTION__, __LINE__, ##__VA_ARGS__) } // namespace DeviceUsageStats } // namespace OHOS #endif // BUNDLE_ACTIVE_LOG_H