From 21b4aaf58dd40bb8c0dc3abc111720868ae7e424 Mon Sep 17 00:00:00 2001 From: zhoumengjie Date: Thu, 25 Jan 2024 19:27:57 +0800 Subject: [PATCH] hilog use macro Signed-off-by: zhoumengjie Change-Id: I6d7e70d455f7a98c0cfb933123e584a0969f8f9c --- libmeminfo/src/meminfo.cpp | 16 +++++++++++----- libpurgeablemem/cpp/include/pm_log.h | 18 +++++++++++------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/libmeminfo/src/meminfo.cpp b/libmeminfo/src/meminfo.cpp index 09b2b98..74469b5 100644 --- a/libmeminfo/src/meminfo.cpp +++ b/libmeminfo/src/meminfo.cpp @@ -22,10 +22,16 @@ #include "file_ex.h" // LoadStringFromFile #include "hilog/log.h" +#undef LOG_TAG +#define LOG_TAG "MemInfo" + +#undef LOG_DOMAIN +#define LOG_DOMAIN 0xD001799 + + namespace OHOS { namespace MemInfo { using namespace OHOS::HDI::Memorytracker::V1_0; -constexpr HiviewDFX::HiLogLabel LABEL = { LOG_CORE, 0xD001799, "MemInfo" }; constexpr int PAGE_TO_KB = 4; constexpr int BYTE_PER_KB = 1024; @@ -41,7 +47,7 @@ uint64_t GetRssByPid(const int pid) // format like: // 640 472 369 38 0 115 0 if (!OHOS::LoadStringFromFile(statmPath, statm)) { - HiviewDFX::HiLog::Error(LABEL, "statm file error!"); + HILOG_ERROR(LOG_CORE, "statm file error!"); return size; } std::istringstream isStatm(statm); @@ -58,7 +64,7 @@ uint64_t GetPssByPid(const int pid) std::string filename = "/proc/" + std::to_string(pid) + "/smaps_rollup"; std::ifstream in(filename); if (!in) { - HiviewDFX::HiLog::Error(LABEL, "File %{public}s not found.\n", filename.c_str()); + HILOG_ERROR(LOG_CORE, "File %{public}s not found.\n", filename.c_str()); return size; } @@ -86,7 +92,7 @@ uint64_t GetSwapPssByPid(const int pid) std::string filename = "/proc/" + std::to_string(pid) + "/smaps_rollup"; std::ifstream in(filename); if (!in) { - HiviewDFX::HiLog::Error(LABEL, "File %{public}s not found.\n", filename.c_str()); + HILOG_ERROR(LOG_CORE, "File %{public}s not found.\n", filename.c_str()); return size; } @@ -113,7 +119,7 @@ bool GetGraphicsMemory(const int pid, uint64_t &gl, uint64_t &graph) bool ret = false; sptr memtrack = IMemoryTrackerInterface::Get(true); if (memtrack == nullptr) { - HiviewDFX::HiLog::Error(LABEL, "memtrack service is null"); + HILOG_ERROR(LOG_CORE, "memtrack service is null"); return ret; } const std::vector> MEMORY_TRACKER_TYPES = { diff --git a/libpurgeablemem/cpp/include/pm_log.h b/libpurgeablemem/cpp/include/pm_log.h index 0a8f0df..da74e6b 100644 --- a/libpurgeablemem/cpp/include/pm_log.h +++ b/libpurgeablemem/cpp/include/pm_log.h @@ -18,7 +18,11 @@ #include "hilog/log.h" -static constexpr OHOS::HiviewDFX::HiLogLabel PM_LOG_LABEL = { LOG_CORE, 0xD001799, "MemMgrPurge" }; +#undef LOG_TAG +#define LOG_TAG "MemMgrPurge" + +#undef LOG_DOMAIN +#define LOG_DOMAIN 0xD001799 #ifdef PM_HILOG_ERROR #undef PM_HILOG_ERROR @@ -35,14 +39,14 @@ static constexpr OHOS::HiviewDFX::HiLogLabel PM_LOG_LABEL = { LOG_CORE, 0xD00179 #define PM_FILENAME "purgeable" #define PM_HILOG_ERROR(logCore, fmt, ...) \ - (void)OHOS::HiviewDFX::HiLog::Error( \ - PM_LOG_LABEL, "[%{public}s(%{public}s:%{public}d)]" fmt, PM_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__) + HILOG_ERROR( \ + LOG_CORE, "[%{public}s(%{public}s:%{public}d)]" fmt, PM_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__) #define PM_HILOG_INFO(logCore, fmt, ...) \ - (void)OHOS::HiviewDFX::HiLog::Info( \ - PM_LOG_LABEL, "[%{public}s(%{public}s:%{public}d)]" fmt, PM_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__) + HILOG_INFO( \ + LOG_CORE, "[%{public}s(%{public}s:%{public}d)]" fmt, PM_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__) #define PM_HILOG_DEBUG(logCore, fmt, ...) \ - (void)OHOS::HiviewDFX::HiLog::Debug( \ - PM_LOG_LABEL, "[%{public}s(%{public}s:%{public}d)]" fmt, PM_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__) + HILOG_DEBUG( \ + LOG_CORE, "[%{public}s(%{public}s:%{public}d)]" fmt, PM_FILENAME, __FUNCTION__, __LINE__, ##__VA_ARGS__) #endif \ No newline at end of file -- Gitee