Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd867303 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by Gerrit Code Review
Browse files

Merge changes I420b5b8a,Ica23fe41 

* changes:
  log.h: wrap android_testLog around __android_log_is_loggable
  log.h: deprecate CONDITION
parents 830914a4 1df92e52

include/log/log.h

+55 −32
Original line number Original line Diff line number Diff line
@@ -79,14 +79,16 @@ extern "C" { 
#endif

#endif

#endif

#endif





#define CONDITION(cond)     (__builtin_expect((cond)!=0, 0))

#ifndef __predict_false

#define __predict_false(exp) __builtin_expect((exp) != 0, 0)

#endif





#ifndef ALOGV_IF

#ifndef ALOGV_IF

#if LOG_NDEBUG

#if LOG_NDEBUG

#define ALOGV_IF(cond, ...)   ((void)0)

#define ALOGV_IF(cond, ...)   ((void)0)

#else

#else

#define ALOGV_IF(cond, ...) \

#define ALOGV_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \

    ? ((void)ALOG(LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -101,7 +103,7 @@ extern "C" { 




#ifndef ALOGD_IF

#ifndef ALOGD_IF

#define ALOGD_IF(cond, ...) \

#define ALOGD_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \

    ? ((void)ALOG(LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -115,7 +117,7 @@ extern "C" { 




#ifndef ALOGI_IF

#ifndef ALOGI_IF

#define ALOGI_IF(cond, ...) \

#define ALOGI_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \

    ? ((void)ALOG(LOG_INFO, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -129,7 +131,7 @@ extern "C" { 




#ifndef ALOGW_IF

#ifndef ALOGW_IF

#define ALOGW_IF(cond, ...) \

#define ALOGW_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \

    ? ((void)ALOG(LOG_WARN, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -143,7 +145,7 @@ extern "C" { 




#ifndef ALOGE_IF

#ifndef ALOGE_IF

#define ALOGE_IF(cond, ...) \

#define ALOGE_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \

    ? ((void)ALOG(LOG_ERROR, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -201,7 +203,8 @@ extern "C" { 
 * Simplified macro to send a verbose system log message using the current LOG_TAG.

 * Simplified macro to send a verbose system log message using the current LOG_TAG.

 */

 */

#ifndef SLOGV

#ifndef SLOGV

#define __SLOGV(...) ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__))

#define __SLOGV(...) \

    ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__))

#if LOG_NDEBUG

#if LOG_NDEBUG

#define SLOGV(...) do { if (0) { __SLOGV(__VA_ARGS__); } } while (0)

#define SLOGV(...) do { if (0) { __SLOGV(__VA_ARGS__); } } while (0)

#else

#else
@@ -209,14 +212,12 @@ extern "C" { 
#endif

#endif

#endif

#endif





#define CONDITION(cond)     (__builtin_expect((cond)!=0, 0))



#ifndef SLOGV_IF

#ifndef SLOGV_IF

#if LOG_NDEBUG

#if LOG_NDEBUG

#define SLOGV_IF(cond, ...)   ((void)0)

#define SLOGV_IF(cond, ...)   ((void)0)

#else

#else

#define SLOGV_IF(cond, ...) \

#define SLOGV_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -226,12 +227,13 @@ extern "C" { 
 * Simplified macro to send a debug system log message using the current LOG_TAG.

 * Simplified macro to send a debug system log message using the current LOG_TAG.

 */

 */

#ifndef SLOGD

#ifndef SLOGD

#define SLOGD(...) ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))

#define SLOGD(...) \

    ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef SLOGD_IF

#ifndef SLOGD_IF

#define SLOGD_IF(cond, ...) \

#define SLOGD_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -240,12 +242,13 @@ extern "C" { 
 * Simplified macro to send an info system log message using the current LOG_TAG.

 * Simplified macro to send an info system log message using the current LOG_TAG.

 */

 */

#ifndef SLOGI

#ifndef SLOGI

#define SLOGI(...) ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))

#define SLOGI(...) \

    ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef SLOGI_IF

#ifndef SLOGI_IF

#define SLOGI_IF(cond, ...) \

#define SLOGI_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -254,12 +257,13 @@ extern "C" { 
 * Simplified macro to send a warning system log message using the current LOG_TAG.

 * Simplified macro to send a warning system log message using the current LOG_TAG.

 */

 */

#ifndef SLOGW

#ifndef SLOGW

#define SLOGW(...) ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))

#define SLOGW(...) \

    ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef SLOGW_IF

#ifndef SLOGW_IF

#define SLOGW_IF(cond, ...) \

#define SLOGW_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -268,12 +272,13 @@ extern "C" { 
 * Simplified macro to send an error system log message using the current LOG_TAG.

 * Simplified macro to send an error system log message using the current LOG_TAG.

 */

 */

#ifndef SLOGE

#ifndef SLOGE

#define SLOGE(...) ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))

#define SLOGE(...) \

    ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef SLOGE_IF

#ifndef SLOGE_IF

#define SLOGE_IF(cond, ...) \

#define SLOGE_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_SYSTEM, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -284,7 +289,8 @@ extern "C" { 
 * Simplified macro to send a verbose radio log message using the current LOG_TAG.

 * Simplified macro to send a verbose radio log message using the current LOG_TAG.

 */

 */

#ifndef RLOGV

#ifndef RLOGV

#define __RLOGV(...) ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__))

#define __RLOGV(...) \

    ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__))

#if LOG_NDEBUG

#if LOG_NDEBUG

#define RLOGV(...) do { if (0) { __RLOGV(__VA_ARGS__); } } while (0)

#define RLOGV(...) do { if (0) { __RLOGV(__VA_ARGS__); } } while (0)

#else

#else
@@ -292,14 +298,12 @@ extern "C" { 
#endif

#endif

#endif

#endif





#define CONDITION(cond)     (__builtin_expect((cond)!=0, 0))



#ifndef RLOGV_IF

#ifndef RLOGV_IF

#if LOG_NDEBUG

#if LOG_NDEBUG

#define RLOGV_IF(cond, ...)   ((void)0)

#define RLOGV_IF(cond, ...)   ((void)0)

#else

#else

#define RLOGV_IF(cond, ...) \

#define RLOGV_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -309,12 +313,13 @@ extern "C" { 
 * Simplified macro to send a debug radio log message using the current LOG_TAG.

 * Simplified macro to send a debug radio log message using the current LOG_TAG.

 */

 */

#ifndef RLOGD

#ifndef RLOGD

#define RLOGD(...) ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))

#define RLOGD(...) \

    ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef RLOGD_IF

#ifndef RLOGD_IF

#define RLOGD_IF(cond, ...) \

#define RLOGD_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -323,12 +328,13 @@ extern "C" { 
 * Simplified macro to send an info radio log message using the current LOG_TAG.

 * Simplified macro to send an info radio log message using the current LOG_TAG.

 */

 */

#ifndef RLOGI

#ifndef RLOGI

#define RLOGI(...) ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))

#define RLOGI(...) \

    ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef RLOGI_IF

#ifndef RLOGI_IF

#define RLOGI_IF(cond, ...) \

#define RLOGI_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -337,12 +343,13 @@ extern "C" { 
 * Simplified macro to send a warning radio log message using the current LOG_TAG.

 * Simplified macro to send a warning radio log message using the current LOG_TAG.

 */

 */

#ifndef RLOGW

#ifndef RLOGW

#define RLOGW(...) ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))

#define RLOGW(...) \

    ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef RLOGW_IF

#ifndef RLOGW_IF

#define RLOGW_IF(cond, ...) \

#define RLOGW_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -351,12 +358,13 @@ extern "C" { 
 * Simplified macro to send an error radio log message using the current LOG_TAG.

 * Simplified macro to send an error radio log message using the current LOG_TAG.

 */

 */

#ifndef RLOGE

#ifndef RLOGE

#define RLOGE(...) ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))

#define RLOGE(...) \

    ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__))

#endif

#endif





#ifndef RLOGE_IF

#ifndef RLOGE_IF

#define RLOGE_IF(cond, ...) \

#define RLOGE_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)) \

    ? ((void)__android_log_buf_print(LOG_ID_RADIO, ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -372,7 +380,7 @@ extern "C" { 
 */

 */

#ifndef LOG_ALWAYS_FATAL_IF

#ifndef LOG_ALWAYS_FATAL_IF

#define LOG_ALWAYS_FATAL_IF(cond, ...) \

#define LOG_ALWAYS_FATAL_IF(cond, ...) \

    ( (CONDITION(cond)) \

    ( (__predict_false(cond)) \

    ? ((void)android_printAssert(#cond, LOG_TAG, ## __VA_ARGS__)) \

    ? ((void)android_printAssert(#cond, LOG_TAG, ## __VA_ARGS__)) \

    : (void)0 )

    : (void)0 )

#endif

#endif
@@ -532,8 +540,23 @@ typedef enum { 
#define android_btWriteLog(tag, type, payload, len) \

#define android_btWriteLog(tag, type, payload, len) \

    __android_log_btwrite(tag, type, payload, len)

    __android_log_btwrite(tag, type, payload, len)





/*

 *    IF_ALOG uses android_testLog, but IF_ALOG can be overridden.

 *    android_testLog will remain constant in its purpose as a wrapper

 *        for Android logging filter policy, and can be subject to

 *        change. It can be reused by the developers that override

 *        IF_ALOG as a convenient means to reimplement their policy

 *        over Android.

 */

#if LOG_NDEBUG /* Production *?

#define android_testLog(prio, tag) \

    (__android_log_is_loggable(prio, tag, ANDROID_LOG_DEBUG) != 0)

#else

#define android_testLog(prio, tag) \

    (__android_log_is_loggable(prio, tag, ANDROID_LOG_VERBOSE) != 0)

#endif



// TODO: remove these prototypes and their users

// TODO: remove these prototypes and their users

#define android_testLog(prio, tag) (1)

#define android_writevLog(vec,num) do{}while(0)

#define android_writevLog(vec,num) do{}while(0)

#define android_write1Log(str,len) do{}while (0)

#define android_write1Log(str,len) do{}while (0)

#define android_setMinPriority(tag, prio) do{}while(0)

#define android_setMinPriority(tag, prio) do{}while(0)