diff options
Diffstat (limited to 'include/cutils/log.h')
| -rw-r--r-- | include/cutils/log.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/include/cutils/log.h b/include/cutils/log.h index 42d7382..0e63809 100644 --- a/include/cutils/log.h +++ b/include/cutils/log.h @@ -47,7 +47,7 @@ extern "C" { // --------------------------------------------------------------------- /* - * Normally we strip LOGV (VERBOSE messages) from release builds. + * Normally we strip ALOGV (VERBOSE messages) from release builds. * You can modify this (for example with "#define LOG_NDEBUG 0" * at the top of your source file) to change that behavior. */ @@ -73,23 +73,23 @@ extern "C" { /* * Simplified macro to send a verbose log message using the current LOG_TAG. */ -#ifndef LOGV +#ifndef ALOGV #if LOG_NDEBUG -#define LOGV(...) ((void)0) +#define ALOGV(...) ((void)0) #else -#define LOGV(...) ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) +#define ALOGV(...) ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) #endif #endif #define CONDITION(cond) (__builtin_expect((cond)!=0, 0)) -#ifndef LOGV_IF +#ifndef ALOGV_IF #if LOG_NDEBUG -#define LOGV_IF(cond, ...) ((void)0) +#define ALOGV_IF(cond, ...) ((void)0) #else -#define LOGV_IF(cond, ...) \ +#define ALOGV_IF(cond, ...) \ ( (CONDITION(cond)) \ - ? ((void)LOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \ + ? ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) #endif #endif @@ -98,13 +98,13 @@ extern "C" { * Simplified macro to send a debug log message using the current LOG_TAG. */ #ifndef LOGD -#define LOGD(...) ((void)LOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) +#define LOGD(...) ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) #endif #ifndef LOGD_IF #define LOGD_IF(cond, ...) \ ( (CONDITION(cond)) \ - ? ((void)LOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \ + ? ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) #endif @@ -112,13 +112,13 @@ extern "C" { * Simplified macro to send an info log message using the current LOG_TAG. */ #ifndef LOGI -#define LOGI(...) ((void)LOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) +#define LOGI(...) ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) #endif #ifndef LOGI_IF #define LOGI_IF(cond, ...) \ ( (CONDITION(cond)) \ - ? ((void)LOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \ + ? ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) #endif @@ -126,13 +126,13 @@ extern "C" { * Simplified macro to send a warning log message using the current LOG_TAG. */ #ifndef LOGW -#define LOGW(...) ((void)LOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) +#define LOGW(...) ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) #endif #ifndef LOGW_IF #define LOGW_IF(cond, ...) \ ( (CONDITION(cond)) \ - ? ((void)LOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \ + ? ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) #endif @@ -140,13 +140,13 @@ extern "C" { * Simplified macro to send an error log message using the current LOG_TAG. */ #ifndef LOGE -#define LOGE(...) ((void)LOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) +#define LOGE(...) ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) #endif #ifndef LOGE_IF #define LOGE_IF(cond, ...) \ ( (CONDITION(cond)) \ - ? ((void)LOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \ + ? ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \ : (void)0 ) #endif @@ -156,11 +156,11 @@ extern "C" { * Conditional based on whether the current LOG_TAG is enabled at * verbose priority. */ -#ifndef IF_LOGV +#ifndef IF_ALOGV #if LOG_NDEBUG -#define IF_LOGV() if (false) +#define IF_ALOGV() if (false) #else -#define IF_LOGV() IF_LOG(LOG_VERBOSE, LOG_TAG) +#define IF_ALOGV() IF_ALOG(LOG_VERBOSE, LOG_TAG) #endif #endif @@ -169,7 +169,7 @@ extern "C" { * debug priority. */ #ifndef IF_LOGD -#define IF_LOGD() IF_LOG(LOG_DEBUG, LOG_TAG) +#define IF_LOGD() IF_ALOG(LOG_DEBUG, LOG_TAG) #endif /* @@ -177,7 +177,7 @@ extern "C" { * info priority. */ #ifndef IF_LOGI -#define IF_LOGI() IF_LOG(LOG_INFO, LOG_TAG) +#define IF_LOGI() IF_ALOG(LOG_INFO, LOG_TAG) #endif /* @@ -185,7 +185,7 @@ extern "C" { * warn priority. */ #ifndef IF_LOGW -#define IF_LOGW() IF_LOG(LOG_WARN, LOG_TAG) +#define IF_LOGW() IF_ALOG(LOG_WARN, LOG_TAG) #endif /* @@ -193,7 +193,7 @@ extern "C" { * error priority. */ #ifndef IF_LOGE -#define IF_LOGE() IF_LOG(LOG_ERROR, LOG_TAG) +#define IF_LOGE() IF_ALOG(LOG_ERROR, LOG_TAG) #endif @@ -340,12 +340,12 @@ extern "C" { * Basic log message macro. * * Example: - * LOG(LOG_WARN, NULL, "Failed with error %d", errno); + * ALOG(LOG_WARN, NULL, "Failed with error %d", errno); * * The second argument may be NULL or "" to indicate the "global" tag. */ -#ifndef LOG -#define LOG(priority, tag, ...) \ +#ifndef ALOG +#define ALOG(priority, tag, ...) \ LOG_PRI(ANDROID_##priority, tag, __VA_ARGS__) #endif @@ -368,8 +368,8 @@ extern "C" { /* * Conditional given a desired logging priority and tag. */ -#ifndef IF_LOG -#define IF_LOG(priority, tag) \ +#ifndef IF_ALOG +#define IF_ALOG(priority, tag) \ if (android_testLog(ANDROID_##priority, tag)) #endif |