Merge changes Iad5b5abf,Iad3704cc,If182dd9b (1cb8d9df) · Commits · e / os / android_system_core

include/android

0 → 120000

+1 −0

Original line number	Diff line number	Diff line
		../liblog/include/android
		No newline at end of file

liblog/include/android/log.h

0 → 100644

+156 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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 _ANDROID_LOG_H
		#define _ANDROID_LOG_H

		/******************************************************************
		*
		* IMPORTANT NOTICE:
		*
		* This file is part of Android's set of stable system headers
		* exposed by the Android NDK (Native Development Kit) since
		* platform release 1.5
		*
		* Third-party source AND binary code relies on the definitions
		* here to be FROZEN ON ALL UPCOMING PLATFORM RELEASES.
		*
		* - DO NOT MODIFY ENUMS (EXCEPT IF YOU ADD NEW 32-BIT VALUES)
		* - DO NOT MODIFY CONSTANTS OR FUNCTIONAL MACROS
		* - DO NOT CHANGE THE SIGNATURE OF FUNCTIONS IN ANY WAY
		* - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
		*/

		/*
		* Support routines to send messages to the Android in-kernel log buffer,
		* which can later be accessed through the 'logcat' utility.
		*
		* Each log message must have
		* - a priority
		* - a log tag
		* - some text
		*
		* The tag normally corresponds to the component that emits the log message,
		* and should be reasonably small.
		*
		* Log message text may be truncated to less than an implementation-specific
		* limit (e.g. 1023 characters max).
		*
		* Note that a newline character ("\n") will be appended automatically to your
		* log message, if not already there. It is not possible to send several messages
		* and have them appear on a single line in logcat.
		*
		* PLEASE USE LOGS WITH MODERATION:
		*
		* - Sending log messages eats CPU and slow down your application and the
		* system.
		*
		* - The circular log buffer is pretty small (<64KB), sending many messages
		* might push off other important log messages from the rest of the system.
		*
		* - In release builds, only send log messages to account for exceptional
		* conditions.
		*
		* NOTE: These functions MUST be implemented by /system/lib/liblog.so
		*/

		#include <stdarg.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		/*
		* Android log priority values, in ascending priority order.
		*/
		typedef enum android_LogPriority {
		ANDROID_LOG_UNKNOWN = 0,
		ANDROID_LOG_DEFAULT, /* only for SetMinPriority() */
		ANDROID_LOG_VERBOSE,
		ANDROID_LOG_DEBUG,
		ANDROID_LOG_INFO,
		ANDROID_LOG_WARN,
		ANDROID_LOG_ERROR,
		ANDROID_LOG_FATAL,
		ANDROID_LOG_SILENT, /* only for SetMinPriority(); must be last */
		} android_LogPriority;

		/*
		* Send a simple string to the log.
		*/
		int __android_log_write(int prio, const char* tag, const char* text);

		/*
		* Send a formatted string to the log, used like printf(fmt,...)
		*/
		int __android_log_print(int prio, const char* tag, const char* fmt, ...)
		#if defined(__GNUC__)
		#ifdef __USE_MINGW_ANSI_STDIO
		#if __USE_MINGW_ANSI_STDIO
		__attribute__ ((__format__(gnu_printf, 3, 4)))
		#else
		__attribute__ ((__format__(printf, 3, 4)))
		#endif
		#else
		__attribute__ ((__format__(printf, 3, 4)))
		#endif
		#endif
		;

		/*
		* A variant of __android_log_print() that takes a va_list to list
		* additional parameters.
		*/
		int __android_log_vprint(int prio, const char* tag,
		const char* fmt, va_list ap)
		#if defined(__GNUC__)
		#ifdef __USE_MINGW_ANSI_STDIO
		#if __USE_MINGW_ANSI_STDIO
		__attribute__ ((__format__(gnu_printf, 3, 0)))
		#else
		__attribute__ ((__format__(printf, 3, 0)))
		#endif
		#else
		__attribute__ ((__format__(printf, 3, 0)))
		#endif
		#endif
		;

		/*
		* Log an assertion failure and abort the process to have a chance
		* to inspect it if a debugger is attached. This uses the FATAL priority.
		*/
		void __android_log_assert(const char* cond, const char* tag,
		const char* fmt, ...)
		#if defined(__GNUC__)
		__attribute__ ((__noreturn__))
		#ifdef __USE_MINGW_ANSI_STDIO
		#if __USE_MINGW_ANSI_STDIO
		__attribute__ ((__format__(gnu_printf, 3, 4)))
		#else
		__attribute__ ((__format__(printf, 3, 4)))
		#endif
		#else
		__attribute__ ((__format__(printf, 3, 4)))
		#endif
		#endif
		;

		#ifdef __cplusplus
		}
		#endif

		#endif /* _ANDROID_LOG_H */

liblog/include/log/log.h

+19 −121

Original line number	Diff line number	Diff line
		@@ -28,6 +28,9 @@
		#include <unistd.h>

		#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
		@@ -44,6 +47,22 @@ extern "C" {
		#define LOG_TAG NULL
		#endif

		/*
		* 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

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

		/*
		@@ -57,16 +76,6 @@ extern "C" {
		#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
		#endif

		/*
		* Send a simple string to the log.
		*/
		int __android_log_buf_write(int bufID, int prio, const char* tag, const char* text);
		int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)
		#if defined(__GNUC__)
		__attribute__((__format__(printf, 4, 5)))
		#endif
		;

		/*
		* Simplified macro to send a verbose system log message using current LOG_TAG.
		*/
		@@ -153,92 +162,6 @@ int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fm

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

		/*
		* 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.
		*/
		@@ -304,25 +227,6 @@ typedef enum {
		(void) __android_log_bswrite(_tag, _value);
		#endif

		#ifndef log_id_t_defined
		#define log_id_t_defined
		typedef enum log_id {
		LOG_ID_MIN = 0,

		LOG_ID_MAIN = 0,
		LOG_ID_RADIO = 1,
		LOG_ID_EVENTS = 2,
		LOG_ID_SYSTEM = 3,
		LOG_ID_CRASH = 4,
		LOG_ID_SECURITY = 5,
		LOG_ID_KERNEL = 6, /* place last, third-parties can not use it */

		LOG_ID_MAX
		} log_id_t;
		#endif
		#define sizeof_log_id_t sizeof(typeof_log_id_t)
		#define typeof_log_id_t unsigned char

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

		/*
		@@ -759,12 +663,6 @@ clockid_t android_log_clockid();

		#endif /* __linux__ */

		/*
		* log_id_t helpers
		*/
		log_id_t android_name_to_log_id(const char* logName);
		const char* android_log_id_to_name(log_id_t log_id);

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

		#ifndef _ANDROID_USE_LIBLOG_SAFETYNET_INTERFACE

liblog/include/log/log_id.h

0 → 100644

+63 −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_ID_H
		#define _LIBS_LOG_LOG_ID_H

		#ifdef __cplusplus
		extern "C" {
		#endif

		#ifndef log_id_t_defined
		#define log_id_t_defined
		typedef enum log_id {
		LOG_ID_MIN = 0,

		LOG_ID_MAIN = 0,
		LOG_ID_RADIO = 1,
		LOG_ID_EVENTS = 2,
		LOG_ID_SYSTEM = 3,
		LOG_ID_CRASH = 4,
		LOG_ID_SECURITY = 5,
		LOG_ID_KERNEL = 6, /* place last, third-parties can not use it */

		LOG_ID_MAX
		} log_id_t;
		#endif
		#define sizeof_log_id_t sizeof(typeof_log_id_t)
		#define typeof_log_id_t unsigned char

		/*
		* Send a simple string to the log.
		*/
		int __android_log_buf_write(int bufID, int prio, const char* tag, const char* text);
		int __android_log_buf_print(int bufID, int prio, const char* tag, const char* fmt, ...)
		#if defined(__GNUC__)
		__attribute__((__format__(printf, 4, 5)))
		#endif
		;

		/*
		* log_id_t helpers
		*/
		log_id_t android_name_to_log_id(const char* logName);
		const char* android_log_id_to_name(log_id_t log_id);

		#ifdef __cplusplus
		}
		#endif

		#endif /* _LIBS_LOG_LOG_ID_H */

include/android/log.h→liblog/include/log/log_main.h

+21 −153

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 The Android Open Source Project
		* 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.
		@@ -14,87 +14,15 @@
		* limitations under the License.
		*/

		#ifndef _ANDROID_LOG_H
		#define _ANDROID_LOG_H
		#ifndef _LIBS_LOG_LOG_MAIN_H
		#define _LIBS_LOG_LOG_MAIN_H

		/******************************************************************
		*
		* IMPORTANT NOTICE:
		*
		* This file is part of Android's set of stable system headers
		* exposed by the Android NDK (Native Development Kit) since
		* platform release 1.5
		*
		* Third-party source AND binary code relies on the definitions
		* here to be FROZEN ON ALL UPCOMING PLATFORM RELEASES.
		*
		* - DO NOT MODIFY ENUMS (EXCEPT IF YOU ADD NEW 32-BIT VALUES)
		* - DO NOT MODIFY CONSTANTS OR FUNCTIONAL MACROS
		* - DO NOT CHANGE THE SIGNATURE OF FUNCTIONS IN ANY WAY
		* - DO NOT CHANGE THE LAYOUT OR SIZE OF STRUCTURES
		*/

		/*
		* Support routines to send messages to the Android in-kernel log buffer,
		* which can later be accessed through the 'logcat' utility.
		*
		* Each log message must have
		* - a priority
		* - a log tag
		* - some text
		*
		* The tag normally corresponds to the component that emits the log message,
		* and should be reasonably small.
		*
		* Log message text may be truncated to less than an implementation-specific
		* limit (e.g. 1023 characters max).
		*
		* Note that a newline character ("\n") will be appended automatically to your
		* log message, if not already there. It is not possible to send several messages
		* and have them appear on a single line in logcat.
		*
		* PLEASE USE LOGS WITH MODERATION:
		*
		* - Sending log messages eats CPU and slow down your application and the
		* system.
		*
		* - The circular log buffer is pretty small (<64KB), sending many messages
		* might push off other important log messages from the rest of the system.
		*
		* - In release builds, only send log messages to account for exceptional
		* conditions.
		*
		* NOTE: These functions MUST be implemented by /system/lib/liblog.so
		*/

		#include <stdarg.h>
		#include <android/log.h>

		#ifdef __cplusplus
		extern "C" {
		#endif

		/*
		* This file uses ", ## __VA_ARGS__" zero-argument token pasting to
		* work around issues with debug-only syntax errors in assertions
		* that are missing format strings. See commit
		* 19299904343daf191267564fe32e6cd5c165cd42
		*/
		#if defined(__clang__)
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
		#endif

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

		/*
		* LOG_TAG is the local tag used for the following simplified
		* logging macros. You must set this preprocessor definition,
		* or more tenuously supply a variable definition, before using
		* the macros.
		*/

		/*
		* Normally we strip the effects of ALOGV (VERBOSE messages),
		* LOG_FATAL and LOG_FATAL_IF (FATAL assert messages) from the
		@@ -111,52 +39,32 @@ extern "C" {
		#endif
		#endif

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

		/*
		* Android log priority values, in ascending priority order.
		* This file uses ", ## __VA_ARGS__" zero-argument token pasting to
		* work around issues with debug-only syntax errors in assertions
		* that are missing format strings. See commit
		* 19299904343daf191267564fe32e6cd5c165cd42
		*/
		#ifndef __android_LogPriority_defined
		#define __android_LogPriority_defined
		typedef enum android_LogPriority {
		ANDROID_LOG_UNKNOWN = 0,
		ANDROID_LOG_DEFAULT, /* only for SetMinPriority() */
		ANDROID_LOG_VERBOSE,
		ANDROID_LOG_DEBUG,
		ANDROID_LOG_INFO,
		ANDROID_LOG_WARN,
		ANDROID_LOG_ERROR,
		ANDROID_LOG_FATAL,
		ANDROID_LOG_SILENT, /* only for SetMinPriority(); must be last */
		} android_LogPriority;
		#if defined(__clang__)
		#pragma clang diagnostic push
		#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
		#endif

		/*
		* Send a simple string to the log.
		*/
		int __android_log_write(int prio, const char* tag, const char* text);
		#ifndef __predict_false
		#define __predict_false(exp) __builtin_expect((exp) != 0, 0)
		#endif

		#define android_writeLog(prio, tag, text) \
		__android_log_write(prio, tag, text)

		/*
		* Send a formatted string to the log, used like printf(fmt,...)
		*/
		int __android_log_print(int prio, const char* tag, const char* fmt, ...)
		#if defined(__GNUC__)
		#ifdef __USE_MINGW_ANSI_STDIO
		#if __USE_MINGW_ANSI_STDIO
		__attribute__ ((format(gnu_printf, 3, 4)))
		#else
		__attribute__ ((format(printf, 3, 4)))
		#endif
		#else
		__attribute__ ((format(printf, 3, 4)))
		#endif
		#endif
		;

		#define android_printLog(prio, tag, ...) \
		__android_log_print(prio, tag, __VA_ARGS__)

		#define android_vprintLog(prio, cond, tag, ...) \
		__android_log_vprint(prio, tag, __VA_ARGS__)

		/*
		* Log macro that allows you to specify a number for the priority.
		*/
		@@ -165,28 +73,6 @@ int __android_log_print(int prio, const char* tag, const char* fmt, ...)
		android_printLog(priority, tag, __VA_ARGS__)
		#endif

		/*
		* A variant of __android_log_print() that takes a va_list to list
		* additional parameters.
		*/
		int __android_log_vprint(int prio, const char* tag,
		const char* fmt, va_list ap)
		#if defined(__GNUC__)
		#ifdef __USE_MINGW_ANSI_STDIO
		#if __USE_MINGW_ANSI_STDIO
		__attribute__ ((format(gnu_printf, 3, 0)))
		#else
		__attribute__ ((format(printf, 3, 0)))
		#endif
		#else
		__attribute__ ((format(printf, 3, 0)))
		#endif
		#endif
		;

		#define android_vprintLog(prio, cond, tag, ...) \
		__android_log_vprint(prio, tag, __VA_ARGS__)

		/*
		* Log macro that allows you to pass in a varargs ("args" is a va_list).
		*/
		@@ -195,25 +81,7 @@ int __android_log_vprint(int prio, const char* tag,
		android_vprintLog(priority, NULL, tag, fmt, args)
		#endif

		/*
		* Log an assertion failure and abort the process to have a chance
		* to inspect it if a debugger is attached. This uses the FATAL priority.
		*/
		void __android_log_assert(const char* cond, const char* tag,
		const char* fmt, ...)
		#if defined(__GNUC__)
		__attribute__ ((__noreturn__))
		#ifdef __USE_MINGW_ANSI_STDIO
		#if __USE_MINGW_ANSI_STDIO
		__attribute__ ((format(gnu_printf, 3, 4)))
		#else
		__attribute__ ((format(printf, 3, 4)))
		#endif
		#else
		__attribute__ ((format(printf, 3, 4)))
		#endif
		#endif
		;
		/* --------------------------------------------------------------------- */

		/* XXX Macros to work around syntax errors in places where format string
		* arg is not passed to ALOG_ASSERT, LOG_ALWAYS_FATAL or LOG_ALWAYS_FATAL_IF
		@@ -524,4 +392,4 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len,
		}
		#endif

		#endif /* _ANDROID_LOG_H */
		#endif /* _LIBS_LOG_LOG_MAIN_H */