Merge changes I8a31ad3a,I8b385d51,I3fdcdc33,Ia4571cd3 am: bc4e9cb94e (3fc9ed68) · Commits · e / os / android_system_core

liblog/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,6 @@
		//

		liblog_sources = [
		"config_write.cpp",
		"log_event_list.cpp",
		"log_event_write.cpp",
		"logger_lock.cpp",

liblog/README.md

+0 −10

Original line number	Diff line number	Diff line
		@@ -96,11 +96,6 @@ Public Functions and Macros

		int android_log_destroy(android_log_context *ctx)

		#include <log/log_transport.h>

		int android_set_log_transport(int transport_flag)
		int android_get_log_transport()

		Description
		-----------

		@@ -144,11 +139,6 @@ size and log buffer format protocol version respectively. `android_logger_get_i
		that was used when opening the sub-log. It is recommended to open the log `ANDROID_LOG_RDONLY` in
		these cases.

		`android_set_log_transport()` selects transport filters. Argument is either `LOGGER_DEFAULT`,
		`LOGGER_LOGD`, or `LOGGER_NULL`. Log to logger daemon for default or logd, or drop contents on floor
		respectively. `Both android_set_log_transport()` and `android_get_log_transport()` return the
		current transport mask, or a negative errno for any problems.

		Errors
		------

liblog/config_write.cpp

deleted100644 → 0

+0 −83

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 <log/log_transport.h>

		#include "config_write.h"
		#include "logger.h"

		struct listnode __android_log_transport_write = {&__android_log_transport_write,
		&__android_log_transport_write};
		struct listnode __android_log_persist_write = {&__android_log_persist_write,
		&__android_log_persist_write};

		static void __android_log_add_transport(struct listnode* list,
		struct android_log_transport_write* transport) {
		uint32_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_write* transp;

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

		void __android_log_config_write() {
		if ((__android_log_transport == LOGGER_DEFAULT) \|\| (__android_log_transport & LOGGER_LOGD)) {
		#if (FAKE_LOG_DEVICE == 0)
		extern struct android_log_transport_write logdLoggerWrite;
		extern struct android_log_transport_write pmsgLoggerWrite;

		__android_log_add_transport(&__android_log_transport_write, &logdLoggerWrite);
		__android_log_add_transport(&__android_log_persist_write, &pmsgLoggerWrite);
		#else
		extern struct android_log_transport_write fakeLoggerWrite;

		__android_log_add_transport(&__android_log_transport_write, &fakeLoggerWrite);
		#endif
		}
		}

		void __android_log_config_write_close() {
		struct android_log_transport_write* transport;
		struct listnode* n;

		write_transport_for_each_safe(transport, n, &__android_log_transport_write) {
		transport->logMask = 0;
		list_remove(&transport->node);
		}
		write_transport_for_each_safe(transport, n, &__android_log_persist_write) {
		transport->logMask = 0;
		list_remove(&transport->node);
		}
		}

liblog/config_write.h

deleted100644 → 0

+0 −52

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

		#pragma once

		#include <cutils/list.h>

		#include "log_portability.h"

		__BEGIN_DECLS

		extern struct listnode __android_log_transport_write;
		extern struct listnode __android_log_persist_write;

		#define write_transport_for_each(transp, transports) \
		for ((transp) = node_to_item((transports)->next, \
		struct android_log_transport_write, node); \
		((transp) != node_to_item((transports), \
		struct android_log_transport_write, node)) && \
		((transp) != node_to_item((transp)->node.next, \
		struct android_log_transport_write, node)); \
		(transp) = node_to_item((transp)->node.next, \
		struct android_log_transport_write, node))

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

		void __android_log_config_write();
		void __android_log_config_write_close();

		__END_DECLS

liblog/fake_writer.cpp

+2 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@

		#include <log/log.h>

		#include "config_write.h"
		#include "fake_log_device.h"
		#include "log_portability.h"
		#include "logger.h"
		@@ -32,9 +31,9 @@ static int fakeWrite(log_id_t log_id, struct timespec* ts, struct iovec* vec, si
		static int logFds[(int)LOG_ID_MAX] = {-1, -1, -1, -1, -1, -1};

		struct android_log_transport_write fakeLoggerWrite = {
		.node = {&fakeLoggerWrite.node, &fakeLoggerWrite.node},
		.context.priv = &logFds,
		.name = "fake",
		.logMask = 0,
		.context.priv = &logFds,
		.available = NULL,
		.open = fakeOpen,
		.close = fakeClose,