openharmony/developtools_profiler
1
0
Fork 0
mirror of https://gitee.com/openharmony/developtools_profiler synced 2024-11-30 10:31:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

临时回退hilog_base修改

Browse Source 
Signed-off-by: ganchuantao <ganchuantao1@huawei.com>
Change-Id: If7b8712de9b6a9f377e95260da38bc4ba2180f2c
This commit is contained in:
ganchuantao 2024-09-19 10:54:01 +08:00
parent 5444e3e578
commit 1032d8b094
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
device/base/include/logging.h
View File

@ -107,10 +107,10 @@ static inline int HiLogPrint(int type, int prio, int domain, ConstCharPtr tag, C
#define LOG_CORE 0 #define LOG_CORE 0
#endif #endif
#define HILOG_BASE_DEBUG(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__) #define HILOG_DEBUG(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_DEBUG, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__)
#define HILOG_BASE_INFO(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_INFO, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__) #define HILOG_INFO(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_INFO, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__)
#define HILOG_BASE_WARN(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_WARN, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__) #define HILOG_WARN(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_WARN, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__)
#define HILOG_BASE_ERROR(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_ERROR, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__) #define HILOG_ERROR(LOG_CORE, fmt, ...) HiLogPrint(LOG_CORE, LOG_ERROR, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__)
#endif // HAVE_HILOG #endif // HAVE_HILOG
@ -153,13 +153,13 @@ static inline std::string StringFormat(const char* fmt, ...)
#ifdef HAVE_HILOG #ifdef HAVE_HILOG
#define HILOG_PRINT_DEBUG(type, fmt, ...) \ #define HILOG_PRINT_DEBUG(type, fmt, ...) \
HILOG_BASE_DEBUG(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str()) HILOG_DEBUG(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str())
#define HILOG_PRINT_INFO(type, fmt, ...) \ #define HILOG_PRINT_INFO(type, fmt, ...) \
HILOG_BASE_INFO(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str()) HILOG_INFO(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str())
#define HILOG_PRINT_WARN(type, fmt, ...) \ #define HILOG_PRINT_WARN(type, fmt, ...) \
HILOG_BASE_WARN(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str()) HILOG_WARN(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str())
#define HILOG_PRINT_ERROR(type, fmt, ...) \ #define HILOG_PRINT_ERROR(type, fmt, ...) \
HILOG_BASE_ERROR(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str()) HILOG_ERROR(type, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str())
#else #else
#define HILOG_PRINT_DEBUG(type, fmt, ...) \ #define HILOG_PRINT_DEBUG(type, fmt, ...) \
HiLogPrint(type, LOG_DEBUG, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__) HiLogPrint(type, LOG_DEBUG, LOG_DOMAIN, LOG_TAG, fmt, ##__VA_ARGS__)
@ -186,7 +186,7 @@ static inline std::string StringFormat(const char* fmt, ...)
if (ptr == nullptr) { \ if (ptr == nullptr) { \
std::string str = std::string("CHECK_NOTNULL(") + logging::StringFormat(fmt, ##__VA_ARGS__) + \ std::string str = std::string("CHECK_NOTNULL(") + logging::StringFormat(fmt, ##__VA_ARGS__) + \
") in " + __func__ + ":" + std::to_string(__LINE__) + "FAILED"; \ ") in " + __func__ + ":" + std::to_string(__LINE__) + "FAILED"; \
HILOG_BASE_WARN(LOG_CORE, "%{public}s", str.c_str()); \ HILOG_WARN(LOG_CORE, "%{public}s", str.c_str()); \
return retval; \ return retval; \
} \ } \
} while (0) } while (0)
@ -197,7 +197,7 @@ static inline std::string StringFormat(const char* fmt, ...)
if (!(expr)) { \ if (!(expr)) { \
std::string str = std::string("CHECK_TRUE(") + logging::StringFormat(fmt, ##__VA_ARGS__) + \ std::string str = std::string("CHECK_TRUE(") + logging::StringFormat(fmt, ##__VA_ARGS__) + \
") in " + __func__ + ":" + std::to_string(__LINE__) + "FAILED"; \ ") in " + __func__ + ":" + std::to_string(__LINE__) + "FAILED"; \
HILOG_BASE_WARN(LOG_CORE, "%{public}s", str.c_str()); \ HILOG_WARN(LOG_CORE, "%{public}s", str.c_str()); \
return retval; \ return retval; \
} \ } \
} while (0) } while (0)
@ -213,7 +213,7 @@ static inline std::string StringFormat(const char* fmt, ...)
#define RETURN_IF(expr, retval, fmt, ...) \ #define RETURN_IF(expr, retval, fmt, ...) \
do { \ do { \
if ((expr)) { \ if ((expr)) { \
HILOG_BASE_WARN(LOG_CORE, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str()); \ HILOG_WARN(LOG_CORE, "%{public}s", logging::StringFormat(fmt, ##__VA_ARGS__).c_str()); \
return retval; \ return retval; \
} \ } \
} while (0) } while (0)