logd: create SimpleLogBuffer and implement ChattyLogBuffer in terms of it (8f613464) · Commits · e / os / android_system_core

logd/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,7 @@ cc_library_static {
	"LogStatistics.cpp",		"LogStatistics.cpp",
	"LogWhiteBlackList.cpp",		"LogWhiteBlackList.cpp",
	"LogTags.cpp",		"LogTags.cpp",
			"SimpleLogBuffer.cpp",
	],		],
	logtags: ["event.logtags"],		logtags: ["event.logtags"],

logd/ChattyLogBuffer.cpp

+51 −313

File changed.

Preview size limit exceeded, changes collapsed.

logd/ChattyLogBuffer.h

+6 −40

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

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

	#include <atomic>
	#include <list>		#include <list>
	#include <optional>		#include <optional>
	#include <string>		#include <string>
	@@ -36,13 +35,12 @@
	#include "LogTags.h"		#include "LogTags.h"
	#include "LogWhiteBlackList.h"		#include "LogWhiteBlackList.h"
	#include "LogWriter.h"		#include "LogWriter.h"
			#include "SimpleLogBuffer.h"
	#include "rwlock.h"		#include "rwlock.h"

	typedef std::list<LogBufferElement> LogBufferElementCollection;		typedef std::list<LogBufferElement> LogBufferElementCollection;

	class ChattyLogBuffer : public LogBuffer {		class ChattyLogBuffer : public SimpleLogBuffer {
	LogBufferElementCollection mLogElements GUARDED_BY(lock_);

	// watermark of any worst/chatty uid processing		// watermark of any worst/chatty uid processing
	typedef std::unordered_map<uid_t, LogBufferElementCollection::iterator> LogBufferIteratorMap;		typedef std::unordered_map<uid_t, LogBufferElementCollection::iterator> LogBufferIteratorMap;
	LogBufferIteratorMap mLastWorst[LOG_ID_MAX] GUARDED_BY(lock_);		LogBufferIteratorMap mLastWorst[LOG_ID_MAX] GUARDED_BY(lock_);
	@@ -50,52 +48,20 @@ class ChattyLogBuffer : public LogBuffer {
	typedef std::unordered_map<pid_t, LogBufferElementCollection::iterator> LogBufferPidIteratorMap;		typedef std::unordered_map<pid_t, LogBufferElementCollection::iterator> LogBufferPidIteratorMap;
	LogBufferPidIteratorMap mLastWorstPidOfSystem[LOG_ID_MAX] GUARDED_BY(lock_);		LogBufferPidIteratorMap mLastWorstPidOfSystem[LOG_ID_MAX] GUARDED_BY(lock_);

	unsigned long mMaxSize[LOG_ID_MAX] GUARDED_BY(lock_);

	public:		public:
	ChattyLogBuffer(LogReaderList* reader_list, LogTags* tags, PruneList* prune,		ChattyLogBuffer(LogReaderList* reader_list, LogTags* tags, PruneList* prune,
	LogStatistics* stats);		LogStatistics* stats);
	~ChattyLogBuffer();		~ChattyLogBuffer();
	void Init() override;

	int Log(log_id_t log_id, log_time realtime, uid_t uid, pid_t pid, pid_t tid, const char* msg,
	uint16_t len) override;
	uint64_t FlushTo(
	LogWriter* writer, uint64_t start, pid_t* lastTid,
	const std::function<FlushToResult(const LogBufferElement* element)>& filter) override;

	bool Clear(log_id_t id, uid_t uid = AID_ROOT) override;		protected:
	unsigned long GetSize(log_id_t id) override;		bool Prune(log_id_t id, unsigned long pruneRows, uid_t uid) REQUIRES(lock_) override;
	int SetSize(log_id_t id, unsigned long size) override;		void LogInternal(LogBufferElement&& elem) REQUIRES(lock_) override;

	uint64_t sequence() const override { return sequence_.load(std::memory_order_relaxed); }

	private:		private:
	void maybePrune(log_id_t id) REQUIRES(lock_);		LogBufferElementCollection::iterator Erase(LogBufferElementCollection::iterator it,
	void kickMe(LogReaderThread* me, log_id_t id, unsigned long pruneRows) REQUIRES_SHARED(lock_);

	bool prune(log_id_t id, unsigned long pruneRows, uid_t uid = AID_ROOT) REQUIRES(lock_);
	LogBufferElementCollection::iterator erase(LogBufferElementCollection::iterator it,
	bool coalesce = false) REQUIRES(lock_);		bool coalesce = false) REQUIRES(lock_);
	bool ShouldLog(log_id_t log_id, const char* msg, uint16_t len);
	void Log(LogBufferElement&& elem) REQUIRES(lock_);

	// Returns an iterator to the oldest element for a given log type, or mLogElements.end() if
	// there are no logs for the given log type. Requires mLogElementsLock to be held.
	LogBufferElementCollection::iterator GetOldest(log_id_t log_id) REQUIRES(lock_);

	LogReaderList* reader_list_;
	LogTags* tags_;
	PruneList* prune_;		PruneList* prune_;
	LogStatistics* stats_;

	// Keeps track of the iterator to the oldest log message of a given log type, as an
	// optimization when pruning logs. Use GetOldest() to retrieve.
	std::optional<LogBufferElementCollection::iterator> oldest_[LOG_ID_MAX];

	RwLock lock_;

	std::atomic<uint64_t> sequence_ = 1;

	// This always contains a copy of the last message logged, for deduplication.		// This always contains a copy of the last message logged, for deduplication.
	std::optional<LogBufferElement> last_logged_elements_[LOG_ID_MAX] GUARDED_BY(lock_);		std::optional<LogBufferElement> last_logged_elements_[LOG_ID_MAX] GUARDED_BY(lock_);

logd/LogBufferTest.cpp

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

logd/LogBufferTest.h

+3 −0

File changed.

Preview size limit exceeded, changes collapsed.