Merge "logd: worst uid record watermark part four" (0df400ec) · Commits · e / os / android_system_core

logd/LogBuffer.cpp

+9 −8

Original line number	Diff line number	Diff line
		@@ -238,7 +238,8 @@ void LogBuffer::maybePrune(log_id_t id) {
		}
		}

		LogBufferElementCollection::iterator LogBuffer::erase(LogBufferElementCollection::iterator it) {
		LogBufferElementCollection::iterator LogBuffer::erase(
		LogBufferElementCollection::iterator it, bool engageStats) {
		LogBufferElement e = it;
		log_id_t id = e->getLogId();
		LogBufferIteratorMap::iterator f = mLastWorstUid[id].find(e->getUid());
		@@ -247,7 +248,11 @@ LogBufferElementCollection::iterator LogBuffer::erase(LogBufferElementCollection
		mLastWorstUid[id].erase(f);
		}
		it = mLogElements.erase(it);
		if (engageStats) {
		stats.subtract(e);
		} else {
		stats.erase(e);
		}
		delete e;

		return it;
		@@ -442,9 +447,7 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {

		// merge any drops
		if (dropped && last.merge(e, dropped)) {
		it = mLogElements.erase(it);
		stats.erase(e);
		delete e;
		it = erase(it, false);
		continue;
		}

		@@ -510,9 +513,7 @@ void LogBuffer::prune(log_id_t id, unsigned long pruneRows, uid_t caller_uid) {
		stats.drop(e);
		e->setDropped(1);
		if (last.merge(e, 1)) {
		it = mLogElements.erase(it);
		stats.erase(e);
		delete e;
		it = erase(it, false);
		} else {
		last.add(e);
		mLastWorstUid[id][e->getUid()] = it;

+2 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,8 @@ public:
		private:
		void maybePrune(log_id_t id);
		void prune(log_id_t id, unsigned long pruneRows, uid_t uid = AID_ROOT);
		LogBufferElementCollection::iterator erase(LogBufferElementCollection::iterator it);
		LogBufferElementCollection::iterator erase(
		LogBufferElementCollection::iterator it, bool engageStats = true);
		};

		#endif // _LOGD_LOG_BUFFER_H__