ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Allow LOG_ALWAYS_FATAL_IF in constexpr functions"

Browse source
This commit is contained in:
Chih-hung Hsieh 2020-01-31 18:15:06 +00:00 • committed by Gerrit Code Review
commit e2a1705f1f
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
liblog/include/log/log_main.h
View file

@ -56,7 +56,7 @@ __BEGIN_DECLS
/* /*
* Use __VA_ARGS__ if running a static analyzer, * Use __VA_ARGS__ if running a static analyzer,
* to avoid warnings of unused variables in __VA_ARGS__. * to avoid warnings of unused variables in __VA_ARGS__.
* Use contexpr function in C++ mode, so these macros can be used * Use constexpr function in C++ mode, so these macros can be used
* in other constexpr functions without warning. * in other constexpr functions without warning.
*/ */
#ifdef __clang_analyzer__ #ifdef __clang_analyzer__
@ -131,10 +131,10 @@ extern int __fake_use_va_args(int, ...);
* is -inverted- from the normal assert() semantics. * is -inverted- from the normal assert() semantics.
*/ */
#ifndef LOG_ALWAYS_FATAL_IF #ifndef LOG_ALWAYS_FATAL_IF
#define LOG_ALWAYS_FATAL_IF(cond, ...) \ #define LOG_ALWAYS_FATAL_IF(cond, ...) \
((__predict_false(cond)) \ ((__predict_false(cond)) ? (__FAKE_USE_VA_ARGS(__VA_ARGS__), \
? ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__)) \ ((void)android_printAssert(#cond, LOG_TAG, ##__VA_ARGS__))) \
: __FAKE_USE_VA_ARGS(__VA_ARGS__)) : ((void)0))
#endif #endif
#ifndef LOG_ALWAYS_FATAL #ifndef LOG_ALWAYS_FATAL
@ -213,9 +213,10 @@ extern int __fake_use_va_args(int, ...);
#if LOG_NDEBUG #if LOG_NDEBUG
#define ALOGV_IF(cond, ...) __FAKE_USE_VA_ARGS(__VA_ARGS__) #define ALOGV_IF(cond, ...) __FAKE_USE_VA_ARGS(__VA_ARGS__)
#else #else
#define ALOGV_IF(cond, ...) \ #define ALOGV_IF(cond, ...) \
((__predict_false(cond)) ? ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \ ((__predict_false(cond)) \
: __FAKE_USE_VA_ARGS(__VA_ARGS__)) ? (__FAKE_USE_VA_ARGS(__VA_ARGS__), (void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \
: ((void)0))
#endif #endif
#endif #endif
@ -227,9 +228,10 @@ extern int __fake_use_va_args(int, ...);
#endif #endif
#ifndef ALOGD_IF #ifndef ALOGD_IF
#define ALOGD_IF(cond, ...) \ #define ALOGD_IF(cond, ...) \
((__predict_false(cond)) ? ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \ ((__predict_false(cond)) \
: __FAKE_USE_VA_ARGS(__VA_ARGS__)) ? (__FAKE_USE_VA_ARGS(__VA_ARGS__), (void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \
: ((void)0))
#endif #endif
/* /*
@ -240,9 +242,10 @@ extern int __fake_use_va_args(int, ...);
#endif #endif
#ifndef ALOGI_IF #ifndef ALOGI_IF
#define ALOGI_IF(cond, ...) \ #define ALOGI_IF(cond, ...) \
((__predict_false(cond)) ? ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \ ((__predict_false(cond)) \
: __FAKE_USE_VA_ARGS(__VA_ARGS__)) ? (__FAKE_USE_VA_ARGS(__VA_ARGS__), (void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \
: ((void)0))
#endif #endif
/* /*
@ -253,9 +256,10 @@ extern int __fake_use_va_args(int, ...);
#endif #endif
#ifndef ALOGW_IF #ifndef ALOGW_IF
#define ALOGW_IF(cond, ...) \ #define ALOGW_IF(cond, ...) \
((__predict_false(cond)) ? ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \ ((__predict_false(cond)) \
: __FAKE_USE_VA_ARGS(__VA_ARGS__)) ? (__FAKE_USE_VA_ARGS(__VA_ARGS__), (void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \
: ((void)0))
#endif #endif
/* /*
@ -266,9 +270,10 @@ extern int __fake_use_va_args(int, ...);
#endif #endif
#ifndef ALOGE_IF #ifndef ALOGE_IF
#define ALOGE_IF(cond, ...) \ #define ALOGE_IF(cond, ...) \
((__predict_false(cond)) ? ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \ ((__predict_false(cond)) \
: __FAKE_USE_VA_ARGS(__VA_ARGS__)) ? (__FAKE_USE_VA_ARGS(__VA_ARGS__), (void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \
: ((void)0))
#endif #endif
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */