Merge "logd: Add LogUtils.h" (72146b93) · Commits · e / os / android_system_core

logd/LogBufferElement.h

+0 −21

Original line number	Diff line number	Diff line
		@@ -25,27 +25,6 @@
		#include <log/log.h>
		#include <log/log_read.h>

		// Hijack this header as a common include file used by most all sources
		// to report some utilities defined here and there.

		namespace android {

		// Furnished in main.cpp. Caller must own and free returned value
		char *uidToName(uid_t uid);

		// Furnished in LogStatistics.cpp. Caller must own and free returned value
		char *pidToName(pid_t pid);
		char *tidToName(pid_t tid);

		// Furnished in main.cpp. Thread safe.
		const char *tagToName(uint32_t tag);

		}

		static inline bool worstUidEnabledForLogid(log_id_t id) {
		return (id != LOG_ID_CRASH) && (id != LOG_ID_KERNEL) && (id != LOG_ID_EVENTS);
		}

		class LogBuffer;

		#define EXPIRE_HOUR_THRESHOLD 24 // Only expire chatty UID logs to preserve

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		#include <log/log.h>

		#include "LogBufferElement.h"
		#include "LogUtils.h"

		#define log_id_for_each(i) \
		for (log_id_t i = LOG_ID_MIN; i < LOG_ID_MAX; i = (log_id_t) (i + 1))

0 → 100644

+45 −0

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

		#include <sys/types.h>

		#include <log/log.h>

		// Hijack this header as a common include file used by most all sources
		// to report some utilities defined here and there.

		namespace android {

		// Furnished in main.cpp. Caller must own and free returned value
		char *uidToName(uid_t uid);

		// Furnished in LogStatistics.cpp. Caller must own and free returned value
		char *pidToName(pid_t pid);
		char *tidToName(pid_t tid);

		// Furnished in main.cpp. Thread safe.
		const char *tagToName(uint32_t tag);

		}

		static inline bool worstUidEnabledForLogid(log_id_t id) {
		return (id != LOG_ID_CRASH) && (id != LOG_ID_KERNEL) && (id != LOG_ID_EVENTS);
		}

		#endif // _LOGD_LOG_UTILS_H__

+1 −1

+1 −0