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

Commit 1736d175 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

liblog: add log/log_radio.h am: c89fea44 am: a3ec4989 

am: 60903bcf

Change-Id: Ibf3bced27023af3dc4c3a7702489557c2ca130ea
parents a446a733 60903bcf

liblog/include/log/log.h

+1 −86
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <android/log.h>

#include <log/log_id.h>

#include <log/log_main.h>

#include <log/log_radio.h>

#include <log/uio.h> /* helper to define iovec for portability */



#ifdef __cplusplus
@@ -161,92 +162,6 @@ extern "C" { 


/* --------------------------------------------------------------------- */



/*

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

 */

#ifndef RLOGV

#define __RLOGV(...) \

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

#if LOG_NDEBUG

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

#else

#define RLOGV(...) __RLOGV(__VA_ARGS__)

#endif

#endif



#ifndef RLOGV_IF

#if LOG_NDEBUG

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

#else

#define RLOGV_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif

#endif



/*

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

 */

#ifndef RLOGD

#define RLOGD(...) \

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

#endif



#ifndef RLOGD_IF

#define RLOGD_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



/*

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

 */

#ifndef RLOGI

#define RLOGI(...) \

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

#endif



#ifndef RLOGI_IF

#define RLOGI_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



/*

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

 */

#ifndef RLOGW

#define RLOGW(...) \

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

#endif



#ifndef RLOGW_IF

#define RLOGW_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



/*

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

 */

#ifndef RLOGE

#define RLOGE(...) \

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

#endif



#ifndef RLOGE_IF

#define RLOGE_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



/* --------------------------------------------------------------------- */



/*

 * Event logging.

 */

liblog/include/log/log_radio.h

0 → 100644
+125 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2005-2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef _LIBS_LOG_LOG_RADIO_H

#define _LIBS_LOG_LOG_RADIO_H



#include <android/log.h>

#include <log/log_id.h>



/*

 * Normally we strip the effects of ALOGV (VERBOSE messages),

 * LOG_FATAL and LOG_FATAL_IF (FATAL assert messages) from the

 * release builds be defining NDEBUG.  You can modify this (for

 * example with "#define LOG_NDEBUG 0" at the top of your source

 * file) to change that behavior.

 */



#ifndef LOG_NDEBUG

#ifdef NDEBUG

#define LOG_NDEBUG 1

#else

#define LOG_NDEBUG 0

#endif

#endif



/* --------------------------------------------------------------------- */



/*

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

 */

#ifndef RLOGV

#define __RLOGV(...) \

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

#if LOG_NDEBUG

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

#else

#define RLOGV(...) __RLOGV(__VA_ARGS__)

#endif

#endif



#ifndef RLOGV_IF

#if LOG_NDEBUG

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

#else

#define RLOGV_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif

#endif



/*

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

 */

#ifndef RLOGD

#define RLOGD(...) \

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

#endif



#ifndef RLOGD_IF

#define RLOGD_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



/*

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

 */

#ifndef RLOGI

#define RLOGI(...) \

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

#endif



#ifndef RLOGI_IF

#define RLOGI_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



/*

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

 */

#ifndef RLOGW

#define RLOGW(...) \

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

#endif



#ifndef RLOGW_IF

#define RLOGW_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



/*

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

 */

#ifndef RLOGE

#define RLOGE(...) \

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

#endif



#ifndef RLOGE_IF

#define RLOGE_IF(cond, ...) \

    ( (__predict_false(cond)) \

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

    : (void)0 )

#endif



#endif /* _LIBS_LOG_LOG_RADIO_H */

liblog/include_vndk/log/log.h

+1 −3
Original line number Diff line number Diff line
@@ -6,9 +6,7 @@ 
#include <android/log.h>

#include <log/log_id.h>

#include <log/log_main.h>



/*The following files will be included once they are available*/

/*#include <log/log_radio.h>*/

#include <log/log_radio.h>



/*

 * LOG_TAG is the local tag used for the following simplified

liblog/include_vndk/log/log_radio.h

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../include/log/log_radio.h
 
 No newline at end of file

liblog/tests/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ test_c_flags := \ 


test_src_files := \

    liblog_test.cpp \

    log_id_test.cpp

    log_id_test.cpp \

    log_radio_test.cpp



# to prevent breaking the build if bionic not relatively visible to us

ifneq ($(wildcard $(LOCAL_PATH)/../../../../bionic/libc/bionic/libc_logging.cpp),)