Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 934a4927 authored Apr 03, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Apr 03, 2019

Merge "Update the format of the am_compact event log message."

parents 1c721134 23223cd3

services/core/java/com/android/server/am/AppCompactor.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -485,9 +485,10 @@ public final class AppCompactor {
		long zramFreeKbAfter = Debug.getZramFreeKb();
		EventLog.writeEvent(EventLogTags.AM_COMPACT, pid, name, action,
		rssBefore[0], rssBefore[1], rssBefore[2], rssBefore[3],
		rssAfter[0], rssAfter[1], rssAfter[2], rssAfter[3], time,
		rssAfter[0] - rssBefore[0], rssAfter[1] - rssBefore[1],
		rssAfter[2] - rssBefore[2], rssAfter[3] - rssBefore[3], time,
		lastCompactAction, lastCompactTime, msg.arg1, msg.arg2,
		zramFreeKbBefore, zramFreeKbAfter);
		zramFreeKbBefore, zramFreeKbAfter - zramFreeKbBefore);
		// Note that as above not taking mPhenoTypeFlagLock here to avoid locking
		// on every single compaction for a flag that will seldom change and the
		// impact of reading the wrong value here is low.

services/core/java/com/android/server/am/EventLogTags.logtags

+1 −1

Original line number	Diff line number	Diff line
		@@ -138,4 +138,4 @@ option java_package com.android.server.am
		30061 am_remove_task (Task ID\|1\|5), (Stack ID\|1\|5)

		# The task is being compacted
		30063 am_compact (Pid\|1\|5),(Process Name\|3),(Action\|3),(BeforeRssTotal\|2\|2),(BeforeRssFile\|2\|2),(BeforeRssAnon\|2\|2),(BeforeRssSwap\|2\|2),(AfterRssTotal\|2\|2),(AfterRssFile\|2\|2),(AfterRssAnon\|2\|2),(AfterRssSwap\|2\|2),(Time\|2\|3),(LastAction\|1\|2),(LastActionTimestamp\|2\|3),(setAdj\|1\|2),(procState\|1\|2),(BeforeZRAMFree\|2\|2),(AfterZRAMFree\|2\|2)
		30063 am_compact (Pid\|1\|5),(Process Name\|3),(Action\|3),(BeforeRssTotal\|2\|2),(BeforeRssFile\|2\|2),(BeforeRssAnon\|2\|2),(BeforeRssSwap\|2\|2),(DeltaRssTotal\|2\|2),(DeltaRssFile\|2\|2),(DeltaRssAnon\|2\|2),(DeltaRssSwap\|2\|2),(Time\|2\|3),(LastAction\|1\|2),(LastActionTimestamp\|2\|3),(setAdj\|1\|2),(procState\|1\|2),(BeforeZRAMFree\|2\|2),(DeltaZRAMFree\|2\|2)