Merge changes from topic '27176738-pmsg-write-core' (593a5c15) · Commits · e / os / android_system_core

include/private/android_logger.h

+34 −0

Original line number	Diff line number	Diff line
		@@ -19,7 +19,10 @@
		#ifndef _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_LOGGER_H_
		#define _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_LOGGER_H_

		/* Android private interfaces */

		#include <stdint.h>
		#include <sys/types.h>

		#include <log/log.h>
		#include <log/log_read.h>
		@@ -95,4 +98,35 @@ typedef struct __attribute__((__packed__)) {
		char data[];
		} android_log_event_string_t;

		#if defined(__cplusplus)
		extern "C" {
		#endif

		#define ANDROID_LOG_PMSG_FILE_MAX_SEQUENCE 256 /* 1MB file */
		#define ANDROID_LOG_PMSG_FILE_SEQUENCE 1000

		ssize_t __android_log_pmsg_file_write(
		log_id_t logId,
		char prio,
		const char *filename,
		const char *buf, size_t len);

		#define LOG_ID_ANY ((log_id_t)-1)
		#define ANDROID_LOG_ANY ANDROID_LOG_UNKNOWN

		/* first 5 arguments match __android_log_msg_file_write, a cast is safe */
		typedef ssize_t (*__android_log_pmsg_file_read_fn)(
		log_id_t logId,
		char prio,
		const char *filename,
		const char buf, size_t len, void arg);

		ssize_t __android_log_pmsg_file_read(
		log_id_t logId, char prio, const char *prefix,
		__android_log_pmsg_file_read_fn fn, void *arg);

		#if defined(__cplusplus)
		}
		#endif

		#endif /* _SYSTEM_CORE_INCLUDE_PRIVATE_ANDROID_LOGGER_H_ */

liblog/Android.bp

+11 −2

Original line number	Diff line number	Diff line
		@@ -15,20 +15,29 @@
		//

		liblog_sources = [
		"logd_write.c",
		"log_event_list.c",
		"log_event_write.c",
		"logger_write.c",
		"config_write.c",
		"logger_name.c",
		"logger_lock.c",
		]
		liblog_host_sources = [
		"fake_log_device.c",
		//"event.logtags",
		"fake_writer.c",
		]
		liblog_target_sources = [
		"event_tag_map.c",
		"config_read.c",
		"log_time.cpp",
		"log_is_loggable.c",
		"logprint.c",
		"log_read.c",
		"pmsg_reader.c",
		"pmsg_writer.c",
		"logd_reader.c",
		"logd_writer.c",
		"logger_read.c",
		]

		// Shared and static library for host and device

liblog/Android.mk

+6 −2

Original line number	Diff line number	Diff line
		@@ -24,10 +24,14 @@ include $(CLEAR_VARS)
		# so make sure we do not regret hard-coding it as follows:
		liblog_cflags := -DLIBLOG_LOG_TAG=1005

		liblog_sources := logd_write.c log_event_list.c log_event_write.c
		liblog_sources := log_event_list.c log_event_write.c logger_write.c
		liblog_sources += config_write.c logger_name.c logger_lock.c
		liblog_host_sources := $(liblog_sources) fake_log_device.c event.logtags
		liblog_host_sources += fake_writer.c
		liblog_target_sources := $(liblog_sources) event_tag_map.c
		liblog_target_sources += log_time.cpp log_is_loggable.c logprint.c log_read.c
		liblog_target_sources += config_read.c log_time.cpp log_is_loggable.c logprint.c
		liblog_target_sources += pmsg_reader.c pmsg_writer.c
		liblog_target_sources += logd_reader.c logd_writer.c logger_read.c

		# Shared and static library for host
		# ========================================================

liblog/config_read.c

0 → 100644

+62 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.
		*/

		#include "config_read.h"
		#include "logger.h"

		LIBLOG_HIDDEN struct listnode __android_log_transport_read =
		{ &__android_log_transport_read, &__android_log_transport_read };
		LIBLOG_HIDDEN struct listnode __android_log_persist_read =
		{ &__android_log_persist_read, &__android_log_persist_read };

		static void __android_log_add_transport(
		struct listnode list, struct android_log_transport_read transport) {
		size_t i;

		/* Try to keep one functioning transport for each log buffer id */
		for (i = LOG_ID_MIN; i < LOG_ID_MAX; i++) {
		struct android_log_transport_read *transp;

		if (list_empty(list)) {
		if (!transport->available \|\| ((*transport->available)(i) >= 0)) {
		list_add_tail(list, &transport->node);
		return;
		}
		} else {
		read_transport_for_each(transp, list) {
		if (!transp->available) {
		return;
		}
		if (((*transp->available)(i) < 0) &&
		(!transport->available \|\|
		((*transport->available)(i) >= 0))) {
		list_add_tail(list, &transport->node);
		return;
		}
		}
		}
		}
		}

		LIBLOG_HIDDEN void __android_log_config_read() {
		#if (FAKE_LOG_DEVICE == 0)
		extern struct android_log_transport_read logdLoggerRead;
		extern struct android_log_transport_read pmsgLoggerRead;

		__android_log_add_transport(&__android_log_transport_read, &logdLoggerRead);
		__android_log_add_transport(&__android_log_persist_read, &pmsgLoggerRead);
		#endif
		}

liblog/config_read.h

0 → 100644

+50 −0

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

		#include <cutils/list.h>

		#include "log_portability.h"

		__BEGIN_DECLS

		extern LIBLOG_HIDDEN struct listnode __android_log_transport_read;
		extern LIBLOG_HIDDEN struct listnode __android_log_persist_read;

		#define read_transport_for_each(transp, transports) \
		for (transp = node_to_item((transports)->next, \
		struct android_log_transport_read, node); \
		(transp != node_to_item(transports, \
		struct android_log_transport_read, node)); \
		transp = node_to_item(transp->node.next, \
		struct android_log_transport_read, node)) \

		#define read_transport_for_each_safe(transp, n, transports) \
		for (transp = node_to_item((transports)->next, \
		struct android_log_transport_read, node), \
		n = transp->node.next; \
		(transp != node_to_item(transports, \
		struct android_log_transport_read, node)); \
		transp = node_to_item(n, struct android_log_transport_read, node), \
		n = transp->node.next)

		LIBLOG_HIDDEN void __android_log_config_read();

		__END_DECLS

		#endif /* _LIBLOG_CONFIG_READ_H__ */