Add Swap and SwapPss to meminfo checkin dump. (41f94edd) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+26 −1

Original line number	Diff line number	Diff line
		@@ -2015,7 +2015,7 @@ public final class ActivityThread {
		private static final String ONE_COUNT_COLUMN_HEADER = "%21s %8s";

		// Formatting for checkin service - update version if row format changes
		private static final int ACTIVITY_THREAD_CHECKIN_VERSION = 3;
		private static final int ACTIVITY_THREAD_CHECKIN_VERSION = 4;

		static void printRow(PrintWriter pw, String format, Object...objs) {
		pw.println(String.format(format, objs));
		@@ -2091,6 +2091,25 @@ public final class ActivityThread {
		pw.print(memInfo.otherPrivateClean); pw.print(',');
		pw.print(memInfo.getTotalPrivateClean()); pw.print(',');

		// Heap info - swapped out
		pw.print(memInfo.nativeSwappedOut); pw.print(',');
		pw.print(memInfo.dalvikSwappedOut); pw.print(',');
		pw.print(memInfo.otherSwappedOut); pw.print(',');
		pw.print(memInfo.getTotalSwappedOut()); pw.print(',');

		// Heap info - swapped out pss
		if (memInfo.hasSwappedOutPss) {
		pw.print(memInfo.nativeSwappedOutPss); pw.print(',');
		pw.print(memInfo.dalvikSwappedOutPss); pw.print(',');
		pw.print(memInfo.otherSwappedOutPss); pw.print(',');
		pw.print(memInfo.getTotalSwappedOutPss()); pw.print(',');
		} else {
		pw.print("N/A,");
		pw.print("N/A,");
		pw.print("N/A,");
		pw.print("N/A,");
		}

		// Heap info - other areas
		for (int i=0; i<Debug.MemoryInfo.NUM_OTHER_STATS; i++) {
		pw.print(Debug.MemoryInfo.getOtherLabel(i)); pw.print(',');
		@@ -2100,6 +2119,12 @@ public final class ActivityThread {
		pw.print(memInfo.getOtherSharedClean(i)); pw.print(',');
		pw.print(memInfo.getOtherPrivateDirty(i)); pw.print(',');
		pw.print(memInfo.getOtherPrivateClean(i)); pw.print(',');
		pw.print(memInfo.getOtherSwappedOut(i)); pw.print(',');
		if (memInfo.hasSwappedOutPss) {
		pw.print(memInfo.getOtherSwappedOutPss(i)); pw.print(',');
		} else {
		pw.print("N/A,");
		}
		}
		return;
		}

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -15502,6 +15502,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		boolean isCompact = false;
		boolean localOnly = false;
		boolean packages = false;
		boolean isCheckinRequest = false;

		int opti = 0;
		while (opti < args.length) {
		@@ -15527,6 +15528,9 @@ public final class ActivityManagerService extends ActivityManagerNative
		localOnly = true;
		} else if ("--package".equals(opt)) {
		packages = true;
		} else if ("--checkin".equals(opt)) {
		isCheckinRequest = true;

		} else if ("-h".equals(opt)) {
		pw.println("meminfo dump options: [-a] [-d] [-c] [-s] [--oom] [process]");
		pw.println(" -a: include all available information for each process.");
		@@ -15537,6 +15541,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		pw.println(" --local: only collect details locally, don't call process.");
		pw.println(" --package: interpret process arg as package, dumping all");
		pw.println(" processes that have loaded that package.");
		pw.println(" --checkin: dump data for a checkin");
		pw.println("If [process] is specified it can be the name or ");
		pw.println("pid of a specific process to dump.");
		return;
		@@ -15545,7 +15550,6 @@ public final class ActivityManagerService extends ActivityManagerNative
		}
		}

		final boolean isCheckinRequest = scanArgs(args, "--checkin");
		long uptime = SystemClock.uptimeMillis();
		long realtime = SystemClock.elapsedRealtime();
		final long[] tmpLong = new long[1];