From 6a002fcabe4a3666a487c37e614756b24b0e3c1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Mon, 1 Apr 2024 17:59:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?hilog=20=E4=BC=98=E5=8C=96=20Signed-off-by:?= =?UTF-8?q?=20=E9=82=B9=E5=8F=8B=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foundations/ability/log/include/update_log.h | 107 +++++++----------- foundations/ability/log/src/update_log.cpp | 23 ++-- .../inner_api/modulemgr/include/module_log.h | 6 +- .../firmware/utils/include/firmware_log.h | 16 +-- 4 files changed, 69 insertions(+), 83 deletions(-) diff --git a/foundations/ability/log/include/update_log.h b/foundations/ability/log/include/update_log.h index 30490c28..86a070cb 100644 --- a/foundations/ability/log/include/update_log.h +++ b/foundations/ability/log/include/update_log.h @@ -23,27 +23,21 @@ namespace OHOS { namespace UpdateEngine { -#ifdef UPDATE_SERVICE -static constexpr OHOS::HiviewDFX::HiLogLabel UPDATE_LABEL = {LOG_CORE, 0xD002E00, "UPDATE_SA"}; -#else -static constexpr OHOS::HiviewDFX::HiLogLabel UPDATE_LABEL = {LOG_CORE, 0xD002E00, "UPDATE_KITS"}; -#endif - const std::string DEFAULT_LABEL = "%"; const std::string DEFAULT_FMT_LABEL = "%s"; const std::string PRIVATE_FMT_LABEL = "%{private}s"; const std::string PUBLIC_FMT_LABEL = "%{public}s"; static constexpr uint32_t UPDATER_SA_DOMAIN_ID = 0xD002E00; -enum UpdaterSaSubModule { - UPDATE_ENGINE_TAG = 0, +enum UpdateModuleTags { + UPDATE_SA_TAG = 0, UPDATE_KITS_TAG, UPDATE_FIRMWARE_TAG, UPDATE_MODULEMGR_TAG, UPDATE_MODULE_MAX }; -static constexpr OHOS::HiviewDFX::HiLogLabel UPDATE_MODULE_LABEL[UPDATE_MODULE_MAX] = { +static constexpr OHOS::HiviewDFX::HiLogLabel UPDATE_LABEL[UPDATE_MODULE_MAX] = { { LOG_CORE, UPDATER_SA_DOMAIN_ID, "UPDATE_SA" }, { LOG_CORE, UPDATER_SA_DOMAIN_ID, "UPDATE_KITS" }, { LOG_CORE, UPDATER_SA_DOMAIN_ID, "UPDATE_FIRMWARE" }, @@ -83,11 +77,11 @@ public: static void SetLogLevel(const UpdateLogLevel &level); static const UpdateLogLevel &GetLogLevel(); static std::string GetBriefFileName(const std::string &file); - static void PrintLongLog(const uint32_t module, const UpdateLogContent &logContent); + static void PrintLongLog(const uint32_t subModuleTag, const UpdateLogContent &logContent); private: - static void PrintLog(const uint32_t module, const UpdateLogContent &logContent); - static void PrintSingleLine(const uint32_t module, const UpdateLogContent &logContent); + static void PrintLog(const uint32_t subModuleTag, const UpdateLogContent &logContent); + static void PrintSingleLine(const uint32_t subModuleTag, const UpdateLogContent &logContent); static std::pair SplitLogByFmtLabel(const std::string &log, const std::string &fmtLabel); static std::string GetFmtLabel(const std::string &log); static int32_t FindSubStrCount(const std::string &str, const std::string &subStr); @@ -97,68 +91,51 @@ private: }; #define R_FILENAME (__builtin_strrchr(__FILE__, '/') ? __builtin_strrchr(__FILE__, '/') + 1 : __FILE__) -#define R_FORMATED(fmt, ...) "[%{public}s] %{public}s#]" fmt, R_FILENAME, __FUNCTION__, ##__VA_ARGS__ - -#define EXEC_PRINT_HILOG(module, fmtlabel, level, fmt) \ - if ((level) == UpdateLogLevel::UPDATE_ERROR) { \ - EXEC_PRINT_HILOGE(module, fmtlabel, fmt); \ - } else if ((level) == UpdateLogLevel::UPDATE_DEBUG) { \ - EXEC_PRINT_HILOGD(module, fmtlabel, fmt); \ - } else { \ - EXEC_PRINT_HILOGI(module, fmtlabel, fmt); \ - } -#define EXEC_PRINT_HILOGE(module, fmtlabel, fmt, ...) \ - if (fmtlabel == PUBLIC_FMT_LABEL) { \ - PRINT_HILOGE(module, "%{public}s", fmt); \ - } else if (fmtlabel == PRIVATE_FMT_LABEL) { \ - PRINT_HILOGE(module, "%{private}s", fmt); \ - } else { \ - PRINT_HILOGE(module, "%s", fmt); \ +#define LONG_PRINT_HILOGI(level, subtag, fmtlabel, fileName, line, fmt, ...) \ + if (fmtlabel == PUBLIC_FMT_LABEL) { \ + BASE_PRINT_LOG(level, subtag, fileName, line, "%{public}s", fmt, ##__VA_ARGS__); \ + } else if (fmtlabel == PRIVATE_FMT_LABEL) { \ + BASE_PRINT_LOG(level, subtag, fileName, line, "%{private}s", fmt, ##__VA_ARGS__); \ + } else { \ + BASE_PRINT_LOG(level, subtag, fileName, line, "%s", fmt, ##__VA_ARGS__); \ } -#define EXEC_PRINT_HILOGD(module, fmtlabel, fmt, ...) \ - if (fmtlabel == PUBLIC_FMT_LABEL) { \ - PRINT_HILOGD(module, "%{public}s", fmt); \ - } else if (fmtlabel == PRIVATE_FMT_LABEL) { \ - PRINT_HILOGD(module, "%{private}s", fmt); \ - } else { \ - PRINT_HILOGD(module, "%s", fmt); \ - } +#define BASE_PRINT_LOG(level, subtag, fileName, line, fmt, ...) \ + (void)HILOG_IMPL(LOG_CORE, level, OHOS::UpdateEngine::UPDATE_LABEL[subtag].domain, \ + OHOS::UpdateEngine::UPDATE_LABEL[subtag].tag, "[%{public}s(%{public}d)]" fmt, fileName, line, ##__VA_ARGS__) -#define EXEC_PRINT_HILOGI(module, fmtlabel, fmt, ...) \ - if (fmtlabel == PUBLIC_FMT_LABEL) { \ - PRINT_HILOGI(module, "%{public}s", fmt); \ - } else if (fmtlabel == PRIVATE_FMT_LABEL) { \ - PRINT_HILOGI(module, "%{private}s", fmt); \ - } else { \ - PRINT_HILOGI(module, "%s", fmt); \ - } -#define PRINT_HILOGE(module, fmt, ...) (void)HILOG_IMPL(LOG_CORE, LOG_ERROR, \ - OHOS::UpdateEngine::UPDATE_MODULE_LABEL[module].domain, OHOS::UpdateEngine::UPDATE_MODULE_LABEL[module].tag, \ - "[%{public}s] %{public}s#]" fmt, R_FILENAME, __FUNCTION__, ##__VA_ARGS__) -#define PRINT_HILOGI(module, fmt, ...) (void)HILOG_IMPL(LOG_CORE, LOG_INFO, \ - OHOS::UpdateEngine::UPDATE_MODULE_LABEL[module].domain, OHOS::UpdateEngine::UPDATE_MODULE_LABEL[module].tag, \ - "[%{public}s] %{public}s#]" fmt, R_FILENAME, __FUNCTION__, ##__VA_ARGS__) -#define PRINT_HILOGD(module, fmt, ...) (void)HILOG_IMPL(LOG_CORE, LOG_DEBUG, \ - OHOS::UpdateEngine::UPDATE_MODULE_LABEL[module].domain, OHOS::UpdateEngine::UPDATE_MODULE_LABEL[module].tag, \ - "[%{public}s] %{public}s#]" fmt, R_FILENAME, __FUNCTION__, ##__VA_ARGS__) - -#define ENGINE_LOGE(fmt, ...) PRINT_HILOGE(UPDATE_ENGINE_TAG, fmt, ##__VA_ARGS__) -#define ENGINE_LOGI(fmt, ...) PRINT_HILOGI(UPDATE_ENGINE_TAG, fmt, ##__VA_ARGS__) -#define ENGINE_LOGD(fmt, ...) PRINT_HILOGD(UPDATE_ENGINE_TAG, fmt, ##__VA_ARGS__) - -#define PRINT_LONG_LOGD(module, label, fmt, args) UpdateLog::PrintLongLog(module, {label, \ +#define PRINT_LOGE(subtag, fmt, ...) BASE_PRINT_LOG(LOG_ERROR, subtag, R_FILENAME, __LINE__, fmt, ##__VA_ARGS__) +#define PRINT_LOGI(subtag, fmt, ...) BASE_PRINT_LOG(LOG_INFO, subtag, R_FILENAME, __LINE__, fmt, ##__VA_ARGS__) +#define PRINT_LOGD(subtag, fmt, ...) BASE_PRINT_LOG(LOG_DEBUG, subtag, R_FILENAME, __LINE__, fmt, ##__VA_ARGS__) + +#ifdef UPDATE_SERVICE +#define ENGINE_LOGE(fmt, ...) PRINT_LOGE(UPDATE_SA_TAG, fmt, ##__VA_ARGS__) +#define ENGINE_LOGI(fmt, ...) PRINT_LOGI(UPDATE_SA_TAG, fmt, ##__VA_ARGS__) +#define ENGINE_LOGD(fmt, ...) PRINT_LOGD(UPDATE_SA_TAG, fmt, ##__VA_ARGS__) +#else +#define ENGINE_LOGE(fmt, ...) PRINT_LOGE(UPDATE_KITS_TAG, fmt, ##__VA_ARGS__) +#define ENGINE_LOGI(fmt, ...) PRINT_LOGI(UPDATE_KITS_TAG, fmt, ##__VA_ARGS__) +#define ENGINE_LOGD(fmt, ...) PRINT_LOGD(UPDATE_KITS_TAG, fmt, ##__VA_ARGS__) +#endif + +#define PRINT_LONG_LOGD(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ UpdateLogLevel::UPDATE_DEBUG, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) -#define PRINT_LONG_LOGI(module, label, fmt, args) UpdateLog::PrintLongLog(module, {label, \ +#define PRINT_LONG_LOGI(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ UpdateLogLevel::UPDATE_INFO, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) -#define PRINT_LONG_LOGE(module, label, fmt, args) UpdateLog::PrintLongLog(module, {label, \ +#define PRINT_LONG_LOGE(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ UpdateLogLevel::UPDATE_ERROR, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) -#define ENGINE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_ENGINE_TAG, UPDATE_LABEL, fmt, args) -#define ENGINE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_ENGINE_TAG, UPDATE_LABEL, fmt, args) -#define ENGINE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_ENGINE_TAG, UPDATE_LABEL, fmt, args) +#ifdef UPDATE_SERVICE +#define ENGINE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_SA_TAG, UPDATE_LABEL, fmt, args) +#define ENGINE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_SA_TAG, UPDATE_LABEL, fmt, args) +#define ENGINE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_SA_TAG, UPDATE_LABEL, fmt, args) +#else +#define ENGINE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_KITS_TAG, UPDATE_LABEL, fmt, args) +#define ENGINE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_KITS_TAG, UPDATE_LABEL, fmt, args) +#define ENGINE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_KITS_TAG, UPDATE_LABEL, fmt, args) +#endif } // namespace UpdateEngine } // namespace OHOS #endif // UPDATE_LOG_H \ No newline at end of file diff --git a/foundations/ability/log/src/update_log.cpp b/foundations/ability/log/src/update_log.cpp index 3651a3b4..dcdef499 100644 --- a/foundations/ability/log/src/update_log.cpp +++ b/foundations/ability/log/src/update_log.cpp @@ -53,36 +53,43 @@ std::string UpdateLog::GetBriefFileName(const std::string &file) return file; } -void UpdateLog::PrintLongLog(const uint32_t module, const UpdateLogContent &logContent) +void UpdateLog::PrintLongLog(const uint32_t subModuleTag, const UpdateLogContent &logContent) { std::string fmtLabel = GetFmtLabel(logContent.log); std::pair splitLogPair = SplitLogByFmtLabel(logContent.log, fmtLabel); - PrintLog(module, logContent.BuildWithFmtAndArgs(PUBLIC_FMT_LABEL, splitLogPair.first)); // log前缀不做打印控制 - PrintLog(module, logContent.BuildWithFmtAndArgs(fmtLabel, logContent.args)); // args采用fmt进行控制 - PrintLog(module, logContent.BuildWithFmtAndArgs(PUBLIC_FMT_LABEL, splitLogPair.second)); // log后缀不做打印控制 + PrintLog(subModuleTag, logContent.BuildWithFmtAndArgs(PUBLIC_FMT_LABEL, splitLogPair.first)); // log前缀不做打印控制 + PrintLog(subModuleTag, logContent.BuildWithFmtAndArgs(fmtLabel, logContent.args)); // args采用fmt进行控制 + PrintLog(subModuleTag, logContent.BuildWithFmtAndArgs(PUBLIC_FMT_LABEL, splitLogPair.second)); // log后缀不做打印控制 } -void UpdateLog::PrintLog(const uint32_t module, const UpdateLogContent &logContent) +void UpdateLog::PrintLog(const uint32_t subModuleTag, const UpdateLogContent &logContent) { int32_t printPos = 0; int32_t len = static_cast(logContent.args.length()); while (printPos < len) { int32_t printLen = std::min(len - printPos, LONG_LOG_LEN); - PrintSingleLine(module, logContent.BuildWithArgs(logContent.args.substr(printPos, printLen))); + PrintSingleLine(subModuleTag, logContent.BuildWithArgs(logContent.args.substr(printPos, printLen))); printPos += printLen; } } -void UpdateLog::PrintSingleLine(const uint32_t module, const UpdateLogContent &logContent) +void UpdateLog::PrintSingleLine(const uint32_t subModuleTag, const UpdateLogContent &logContent) { // BASE_PRINT_LOG的第三个参数是hilog方法名，即hilogMethod std::string fmtLabel = GetFmtLabel(logContent.log); switch (logContent.level) { case UpdateLogLevel::UPDATE_DEBUG: + LONG_PRINT_HILOGI(LOG_DEBUG, subModuleTag, fmtLabel, \ + UpdateLog::GetBriefFileName(logContent.fileName).c_str(), logContent.line, logContent.args.c_str()); + break; case UpdateLogLevel::UPDATE_INFO: + LONG_PRINT_HILOGI(LOG_INFO, subModuleTag, fmtLabel, \ + UpdateLog::GetBriefFileName(logContent.fileName).c_str(), logContent.line, logContent.args.c_str()); + break; case UpdateLogLevel::UPDATE_ERROR: - EXEC_PRINT_HILOG(module, fmtLabel, logContent.level, logContent.args.c_str()); + LONG_PRINT_HILOGI(LOG_ERROR, subModuleTag, fmtLabel, \ + UpdateLog::GetBriefFileName(logContent.fileName).c_str(), logContent.line, logContent.args.c_str()); break; default: break; diff --git a/interfaces/inner_api/modulemgr/include/module_log.h b/interfaces/inner_api/modulemgr/include/module_log.h index 2a39a000..f5f22dd6 100644 --- a/interfaces/inner_api/modulemgr/include/module_log.h +++ b/interfaces/inner_api/modulemgr/include/module_log.h @@ -19,8 +19,8 @@ #include "update_log.h" -#define UTILS_LOGE(fmt, ...) PRINT_HILOGE(OHOS::UpdateEngine::UPDATE_MODULEMGR_TAG, fmt, ##__VA_ARGS__) -#define UTILS_LOGI(fmt, ...) PRINT_HILOGI(OHOS::UpdateEngine::UPDATE_MODULEMGR_TAG, fmt, ##__VA_ARGS__) -#define UTILS_LOGD(fmt, ...) PRINT_HILOGD(OHOS::UpdateEngine::UPDATE_MODULEMGR_TAG, fmt, ##__VA_ARGS__) +#define UTILS_LOGE(fmt, ...) PRINT_LOGE(OHOS::UpdateEngine::UPDATE_MODULEMGR_TAG, fmt, ##__VA_ARGS__) +#define UTILS_LOGI(fmt, ...) PRINT_LOGI(OHOS::UpdateEngine::UPDATE_MODULEMGR_TAG, fmt, ##__VA_ARGS__) +#define UTILS_LOGD(fmt, ...) PRINT_LOGD(OHOS::UpdateEngine::UPDATE_MODULEMGR_TAG, fmt, ##__VA_ARGS__) #endif // UPDATE_SERVICE__MODULE_LOG_H diff --git a/services/firmware/utils/include/firmware_log.h b/services/firmware/utils/include/firmware_log.h index fcf5857f..4b2ca45f 100644 --- a/services/firmware/utils/include/firmware_log.h +++ b/services/firmware/utils/include/firmware_log.h @@ -20,15 +20,17 @@ namespace OHOS { namespace UpdateEngine { -static constexpr OHOS::HiviewDFX::HiLogLabel FIRMWARE_UPDATE_LABEL = {LOG_CORE, 0xD002E00, "UPDATE_FIRMWARE"}; -#define FIRMWARE_LOGD(fmt, ...) PRINT_HILOGD(UPDATE_FIRMWARE_TAG, fmt, ##__VA_ARGS__) -#define FIRMWARE_LOGI(fmt, ...) PRINT_HILOGI(UPDATE_FIRMWARE_TAG, fmt, ##__VA_ARGS__) -#define FIRMWARE_LOGE(fmt, ...) PRINT_HILOGE(UPDATE_FIRMWARE_TAG, fmt, ##__VA_ARGS__) +#define FIRMWARE_LOGD(fmt, ...) PRINT_LOGD(UPDATE_FIRMWARE_TAG, fmt, ##__VA_ARGS__) +#define FIRMWARE_LOGI(fmt, ...) PRINT_LOGI(UPDATE_FIRMWARE_TAG, fmt, ##__VA_ARGS__) +#define FIRMWARE_LOGE(fmt, ...) PRINT_LOGE(UPDATE_FIRMWARE_TAG, fmt, ##__VA_ARGS__) -#define FIRMWARE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_FIRMWARE_TAG, FIRMWARE_UPDATE_LABEL, fmt, args) -#define FIRMWARE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_FIRMWARE_TAG, FIRMWARE_UPDATE_LABEL, fmt, args) -#define FIRMWARE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_FIRMWARE_TAG, FIRMWARE_UPDATE_LABEL, fmt, args) +#define FIRMWARE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_FIRMWARE_TAG, UPDATE_LABEL[UPDATE_FIRMWARE_TAG], \ + fmt, args) +#define FIRMWARE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_FIRMWARE_TAG, UPDATE_LABEL[UPDATE_FIRMWARE_TAG], \ + fmt, args) +#define FIRMWARE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_FIRMWARE_TAG, UPDATE_LABEL[UPDATE_FIRMWARE_TAG], \ + fmt, args) } // namespace UpdateEngine } // namespace OHOS #endif // FIRMWARE_LOG_H \ No newline at end of file -- Gitee From 198d7e11fbeb9a07d78dbd0495d412bb474d5b9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE?= Date: Wed, 3 Apr 2024 09:11:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96hilog=20Signed-off-by:=20?= =?UTF-8?q?=E9=82=B9=E5=8F=8B=E6=9D=BE=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foundations/ability/log/include/update_log.h | 32 ++++++++------------ 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/foundations/ability/log/include/update_log.h b/foundations/ability/log/include/update_log.h index 86a070cb..f3238753 100644 --- a/foundations/ability/log/include/update_log.h +++ b/foundations/ability/log/include/update_log.h @@ -71,6 +71,12 @@ struct UpdateLogContent { }; }; +#ifdef UPDATE_SERVICE +constexpr int32_t UPDATE_LOG_TAG_ID = UPDATE_SA_TAG; +#else +constexpr int32_t UPDATE_LOG_TAG_ID = UPDATE_KITS_TAG; +#endif + class UpdateLog { public: static bool JudgeLevel(const UpdateLogLevel &level); @@ -110,15 +116,9 @@ private: #define PRINT_LOGI(subtag, fmt, ...) BASE_PRINT_LOG(LOG_INFO, subtag, R_FILENAME, __LINE__, fmt, ##__VA_ARGS__) #define PRINT_LOGD(subtag, fmt, ...) BASE_PRINT_LOG(LOG_DEBUG, subtag, R_FILENAME, __LINE__, fmt, ##__VA_ARGS__) -#ifdef UPDATE_SERVICE -#define ENGINE_LOGE(fmt, ...) PRINT_LOGE(UPDATE_SA_TAG, fmt, ##__VA_ARGS__) -#define ENGINE_LOGI(fmt, ...) PRINT_LOGI(UPDATE_SA_TAG, fmt, ##__VA_ARGS__) -#define ENGINE_LOGD(fmt, ...) PRINT_LOGD(UPDATE_SA_TAG, fmt, ##__VA_ARGS__) -#else -#define ENGINE_LOGE(fmt, ...) PRINT_LOGE(UPDATE_KITS_TAG, fmt, ##__VA_ARGS__) -#define ENGINE_LOGI(fmt, ...) PRINT_LOGI(UPDATE_KITS_TAG, fmt, ##__VA_ARGS__) -#define ENGINE_LOGD(fmt, ...) PRINT_LOGD(UPDATE_KITS_TAG, fmt, ##__VA_ARGS__) -#endif +#define ENGINE_LOGE(fmt, ...) PRINT_LOGE(UPDATE_LOG_TAG_ID, fmt, ##__VA_ARGS__) +#define ENGINE_LOGI(fmt, ...) PRINT_LOGI(UPDATE_LOG_TAG_ID, fmt, ##__VA_ARGS__) +#define ENGINE_LOGD(fmt, ...) PRINT_LOGD(UPDATE_LOG_TAG_ID, fmt, ##__VA_ARGS__) #define PRINT_LONG_LOGD(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ UpdateLogLevel::UPDATE_DEBUG, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) @@ -127,15 +127,9 @@ private: #define PRINT_LONG_LOGE(subtag, label, fmt, args) UpdateLog::PrintLongLog(subtag, {label, \ UpdateLogLevel::UPDATE_ERROR, std::string(fmt), std::string(args), std::string(__FILE__), __LINE__}) -#ifdef UPDATE_SERVICE -#define ENGINE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_SA_TAG, UPDATE_LABEL, fmt, args) -#define ENGINE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_SA_TAG, UPDATE_LABEL, fmt, args) -#define ENGINE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_SA_TAG, UPDATE_LABEL, fmt, args) -#else -#define ENGINE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_KITS_TAG, UPDATE_LABEL, fmt, args) -#define ENGINE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_KITS_TAG, UPDATE_LABEL, fmt, args) -#define ENGINE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_KITS_TAG, UPDATE_LABEL, fmt, args) -#endif +#define ENGINE_LONG_LOGD(fmt, args) PRINT_LONG_LOGD(UPDATE_LOG_TAG_ID, UPDATE_LABEL, fmt, args) +#define ENGINE_LONG_LOGI(fmt, args) PRINT_LONG_LOGI(UPDATE_LOG_TAG_ID, UPDATE_LABEL, fmt, args) +#define ENGINE_LONG_LOGE(fmt, args) PRINT_LONG_LOGE(UPDATE_LOG_TAG_ID, UPDATE_LABEL, fmt, args) } // namespace UpdateEngine } // namespace OHOS -#endif // UPDATE_LOG_H \ No newline at end of file +#endif // UPDATE_LOG_H -- Gitee