Merge "logd: don't coalesce identical log messages in the security buffer" am:... (72869b15) · Commits · e / os / android_system_core

logd/LogBuffer.cpp

+30 −24

Original line number	Diff line number	Diff line
		@@ -207,9 +207,17 @@ int LogBuffer::log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid,
		// exact entry with time specified in ms or us precision.
		if ((realtime.tv_nsec % 1000) == 0) ++realtime.tv_nsec;

		LogBufferElement* elem =
		new LogBufferElement(log_id, realtime, uid, pid, tid, msg, len);
		if (log_id != LOG_ID_SECURITY) {
		LogBufferElement* elem = new LogBufferElement(log_id, realtime, uid, pid, tid, msg, len);

		// b/137093665: don't coalesce security messages.
		if (log_id == LOG_ID_SECURITY) {
		wrlock();
		log(elem);
		unlock();

		return len;
		}

		int prio = ANDROID_LOG_INFO;
		const char* tag = nullptr;
		size_t tag_len = 0;
		@@ -223,8 +231,7 @@ int LogBuffer::log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid,
		tag = msg + 1;
		tag_len = strnlen(tag, len - 1);
		}
		if (!__android_log_is_loggable_len(prio, tag, tag_len,
		ANDROID_LOG_VERBOSE)) {
		if (!__android_log_is_loggable_len(prio, tag, tag_len, ANDROID_LOG_VERBOSE)) {
		// Log traffic received to total
		wrlock();
		stats.addTotal(elem);
		@@ -232,7 +239,6 @@ int LogBuffer::log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid,
		delete elem;
		return -EACCES;
		}
		}

		wrlock();
		LogBufferElement* currentLast = lastLoggedElements[log_id];