Merge changes I96415ec6,I5d3aa7f9,I6294915e,I361928c0 (c1a1823c) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityThread.java

+80 −21

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;
		}
		@@ -2107,35 +2132,44 @@ public final class ActivityThread {
		if (!dumpSummaryOnly) {
		if (dumpFullInfo) {
		printRow(pw, HEAP_FULL_COLUMN, "", "Pss", "Pss", "Shared", "Private",
		"Shared", "Private", "Swapped", "Heap", "Heap", "Heap");
		"Shared", "Private", memInfo.hasSwappedOutPss ? "SwapPss" : "Swap",
		"Heap", "Heap", "Heap");
		printRow(pw, HEAP_FULL_COLUMN, "", "Total", "Clean", "Dirty", "Dirty",
		"Clean", "Clean", "Dirty", "Size", "Alloc", "Free");
		"Clean", "Clean", "Dirty",
		"Size", "Alloc", "Free");
		printRow(pw, HEAP_FULL_COLUMN, "", "------", "------", "------", "------",
		"------", "------", "------", "------", "------", "------");
		printRow(pw, HEAP_FULL_COLUMN, "Native Heap", memInfo.nativePss,
		memInfo.nativeSwappablePss, memInfo.nativeSharedDirty,
		memInfo.nativePrivateDirty, memInfo.nativeSharedClean,
		memInfo.nativePrivateClean, memInfo.nativeSwappedOut,
		memInfo.nativePrivateClean, memInfo.hasSwappedOutPss ?
		memInfo.nativeSwappedOut : memInfo.nativeSwappedOutPss,
		nativeMax, nativeAllocated, nativeFree);
		printRow(pw, HEAP_FULL_COLUMN, "Dalvik Heap", memInfo.dalvikPss,
		memInfo.dalvikSwappablePss, memInfo.dalvikSharedDirty,
		memInfo.dalvikPrivateDirty, memInfo.dalvikSharedClean,
		memInfo.dalvikPrivateClean, memInfo.dalvikSwappedOut,
		memInfo.dalvikPrivateClean, memInfo.hasSwappedOutPss ?
		memInfo.dalvikSwappedOut : memInfo.dalvikSwappedOutPss,
		dalvikMax, dalvikAllocated, dalvikFree);
		} else {
		printRow(pw, HEAP_COLUMN, "", "Pss", "Private",
		"Private", "Swapped", "Heap", "Heap", "Heap");
		"Private", memInfo.hasSwappedOutPss ? "SwapPss" : "Swap",
		"Heap", "Heap", "Heap");
		printRow(pw, HEAP_COLUMN, "", "Total", "Dirty",
		"Clean", "Dirty", "Size", "Alloc", "Free");
		printRow(pw, HEAP_COLUMN, "", "------", "------", "------",
		"------", "------", "------", "------", "------");
		printRow(pw, HEAP_COLUMN, "Native Heap", memInfo.nativePss,
		memInfo.nativePrivateDirty,
		memInfo.nativePrivateClean, memInfo.nativeSwappedOut,
		memInfo.nativePrivateClean,
		memInfo.hasSwappedOutPss ? memInfo.nativeSwappedOutPss :
		memInfo.nativeSwappedOut,
		nativeMax, nativeAllocated, nativeFree);
		printRow(pw, HEAP_COLUMN, "Dalvik Heap", memInfo.dalvikPss,
		memInfo.dalvikPrivateDirty,
		memInfo.dalvikPrivateClean, memInfo.dalvikSwappedOut,
		memInfo.dalvikPrivateClean,
		memInfo.hasSwappedOutPss ? memInfo.dalvikSwappedOutPss :
		memInfo.dalvikSwappedOut,
		dalvikMax, dalvikAllocated, dalvikFree);
		}

		@@ -2146,6 +2180,7 @@ public final class ActivityThread {
		int otherSharedClean = memInfo.otherSharedClean;
		int otherPrivateClean = memInfo.otherPrivateClean;
		int otherSwappedOut = memInfo.otherSwappedOut;
		int otherSwappedOutPss = memInfo.otherSwappedOutPss;

		for (int i=0; i<Debug.MemoryInfo.NUM_OTHER_STATS; i++) {
		final int myPss = memInfo.getOtherPss(i);
		@@ -2155,16 +2190,22 @@ public final class ActivityThread {
		final int mySharedClean = memInfo.getOtherSharedClean(i);
		final int myPrivateClean = memInfo.getOtherPrivateClean(i);
		final int mySwappedOut = memInfo.getOtherSwappedOut(i);
		final int mySwappedOutPss = memInfo.getOtherSwappedOutPss(i);
		if (myPss != 0 \|\| mySharedDirty != 0 \|\| myPrivateDirty != 0
		\|\| mySharedClean != 0 \|\| myPrivateClean != 0 \|\| mySwappedOut != 0) {
		\|\| mySharedClean != 0 \|\| myPrivateClean != 0
		\|\| (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {
		if (dumpFullInfo) {
		printRow(pw, HEAP_FULL_COLUMN, Debug.MemoryInfo.getOtherLabel(i),
		myPss, mySwappablePss, mySharedDirty, myPrivateDirty,
		mySharedClean, myPrivateClean, mySwappedOut, "", "", "");
		mySharedClean, myPrivateClean,
		memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,
		"", "", "");
		} else {
		printRow(pw, HEAP_COLUMN, Debug.MemoryInfo.getOtherLabel(i),
		myPss, myPrivateDirty,
		myPrivateClean, mySwappedOut, "", "", "");
		myPrivateClean,
		memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,
		"", "", "");
		}
		otherPss -= myPss;
		otherSwappablePss -= mySwappablePss;
		@@ -2173,26 +2214,32 @@ public final class ActivityThread {
		otherSharedClean -= mySharedClean;
		otherPrivateClean -= myPrivateClean;
		otherSwappedOut -= mySwappedOut;
		otherSwappedOutPss -= mySwappedOutPss;
		}
		}

		if (dumpFullInfo) {
		printRow(pw, HEAP_FULL_COLUMN, "Unknown", otherPss, otherSwappablePss,
		otherSharedDirty, otherPrivateDirty, otherSharedClean, otherPrivateClean,
		otherSwappedOut, "", "", "");
		memInfo.hasSwappedOutPss ? otherSwappedOutPss : otherSwappedOut,
		"", "", "");
		printRow(pw, HEAP_FULL_COLUMN, "TOTAL", memInfo.getTotalPss(),
		memInfo.getTotalSwappablePss(),
		memInfo.getTotalSharedDirty(), memInfo.getTotalPrivateDirty(),
		memInfo.getTotalSharedClean(), memInfo.getTotalPrivateClean(),
		memInfo.getTotalSwappedOut(), nativeMax+dalvikMax,
		nativeAllocated+dalvikAllocated, nativeFree+dalvikFree);
		memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOut() :
		memInfo.getTotalSwappedOutPss(),
		nativeMax+dalvikMax, nativeAllocated+dalvikAllocated,
		nativeFree+dalvikFree);
		} else {
		printRow(pw, HEAP_COLUMN, "Unknown", otherPss,
		otherPrivateDirty, otherPrivateClean, otherSwappedOut,
		otherPrivateDirty, otherPrivateClean,
		memInfo.hasSwappedOutPss ? otherSwappedOutPss : otherSwappedOut,
		"", "", "");
		printRow(pw, HEAP_COLUMN, "TOTAL", memInfo.getTotalPss(),
		memInfo.getTotalPrivateDirty(),
		memInfo.getTotalPrivateClean(),
		memInfo.hasSwappedOutPss ? memInfo.getTotalSwappedOutPss() :
		memInfo.getTotalSwappedOut(),
		nativeMax+dalvikMax,
		nativeAllocated+dalvikAllocated, nativeFree+dalvikFree);
		@@ -2211,16 +2258,22 @@ public final class ActivityThread {
		final int mySharedClean = memInfo.getOtherSharedClean(i);
		final int myPrivateClean = memInfo.getOtherPrivateClean(i);
		final int mySwappedOut = memInfo.getOtherSwappedOut(i);
		final int mySwappedOutPss = memInfo.getOtherSwappedOutPss(i);
		if (myPss != 0 \|\| mySharedDirty != 0 \|\| myPrivateDirty != 0
		\|\| mySharedClean != 0 \|\| myPrivateClean != 0) {
		\|\| mySharedClean != 0 \|\| myPrivateClean != 0
		\|\| (memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut) != 0) {
		if (dumpFullInfo) {
		printRow(pw, HEAP_FULL_COLUMN, Debug.MemoryInfo.getOtherLabel(i),
		myPss, mySwappablePss, mySharedDirty, myPrivateDirty,
		mySharedClean, myPrivateClean, mySwappedOut, "", "", "");
		mySharedClean, myPrivateClean,
		memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,
		"", "", "");
		} else {
		printRow(pw, HEAP_COLUMN, Debug.MemoryInfo.getOtherLabel(i),
		myPss, myPrivateDirty,
		myPrivateClean, mySwappedOut, "", "", "");
		myPrivateClean,
		memInfo.hasSwappedOutPss ? mySwappedOutPss : mySwappedOut,
		"", "", "");
		}
		}
		}
		@@ -2246,10 +2299,16 @@ public final class ActivityThread {
		printRow(pw, ONE_COUNT_COLUMN,
		"System:", memInfo.getSummarySystem());
		pw.println(" ");
		if (memInfo.hasSwappedOutPss) {
		printRow(pw, TWO_COUNT_COLUMNS,
		"TOTAL:", memInfo.getSummaryTotalPss(),
		"TOTAL SWAP PSS:", memInfo.getSummaryTotalSwapPss());
		} else {
		printRow(pw, TWO_COUNT_COLUMNS,
		"TOTAL:", memInfo.getSummaryTotalPss(),
		"TOTAL SWAP (KB):", memInfo.getSummaryTotalSwap());
		}
		}

		public void registerOnActivityPausedListener(Activity activity,
		OnActivityPausedListener listener) {

core/java/android/os/Debug.java

+53 −7

Original line number	Diff line number	Diff line
		@@ -130,6 +130,9 @@ public final class Debug
		/** The dirty dalvik pages that have been swapped out. */
		/** @hide We may want to expose this, eventually. */
		public int dalvikSwappedOut;
		/** The dirty dalvik pages that have been swapped out, proportional. */
		/** @hide We may want to expose this, eventually. */
		public int dalvikSwappedOutPss;

		/** The proportional set size for the native heap. */
		public int nativePss;
		@@ -149,6 +152,9 @@ public final class Debug
		/** The dirty native pages that have been swapped out. */
		/** @hide We may want to expose this, eventually. */
		public int nativeSwappedOut;
		/** The dirty native pages that have been swapped out, proportional. */
		/** @hide We may want to expose this, eventually. */
		public int nativeSwappedOutPss;

		/** The proportional set size for everything else. */
		public int otherPss;
		@@ -168,6 +174,13 @@ public final class Debug
		/** The dirty pages used by anyting else that have been swapped out. */
		/** @hide We may want to expose this, eventually. */
		public int otherSwappedOut;
		/** The dirty pages used by anyting else that have been swapped out, proportional. */
		/** @hide We may want to expose this, eventually. */
		public int otherSwappedOutPss;

		/** Whether the kernel reports proportional swap usage */
		/** @hide */
		public boolean hasSwappedOutPss;

		/** @hide */
		public static final int HEAP_UNKNOWN = 0;
		@@ -235,7 +248,7 @@ public final class Debug
		public static final int NUM_DVK_STATS = 8;

		/** @hide */
		public static final int NUM_CATEGORIES = 7;
		public static final int NUM_CATEGORIES = 8;

		/** @hide */
		public static final int offsetPss = 0;
		@@ -251,6 +264,8 @@ public final class Debug
		public static final int offsetSharedClean = 5;
		/** @hide */
		public static final int offsetSwappedOut = 6;
		/** @hide */
		public static final int offsetSwappedOutPss = 7;

		private int[] otherStats = new int[(NUM_OTHER_STATS+NUM_DVK_STATS)*NUM_CATEGORIES];

		@@ -261,7 +276,7 @@ public final class Debug
		* Return total PSS memory usage in kB.
		*/
		public int getTotalPss() {
		return dalvikPss + nativePss + otherPss;
		return dalvikPss + nativePss + otherPss + getTotalSwappedOutPss();
		}

		/**
		@@ -274,7 +289,8 @@ public final class Debug
		}

		/**
		* Return total PSS memory usage in kB.
		* Return total PSS memory usage in kB mapping a file of one of the following extension:
		* .so, .jar, .apk, .ttf, .dex, .odex, .oat, .art .
		*/
		public int getTotalSwappablePss() {
		return dalvikSwappablePss + nativeSwappablePss + otherSwappablePss;
		@@ -316,6 +332,14 @@ public final class Debug
		return dalvikSwappedOut + nativeSwappedOut + otherSwappedOut;
		}

		/**
		* Return total swapped out memory in kB, proportional.
		* @hide
		*/
		public int getTotalSwappedOutPss() {
		return dalvikSwappedOutPss + nativeSwappedOutPss + otherSwappedOutPss;
		}

		/** @hide */
		public int getOtherPss(int which) {
		return otherStats[which*NUM_CATEGORIES + offsetPss];
		@@ -358,6 +382,11 @@ public final class Debug
		return otherStats[which*NUM_CATEGORIES + offsetSwappedOut];
		}

		/** @hide */
		public int getOtherSwappedOutPss(int which) {
		return otherStats[which*NUM_CATEGORIES + offsetSwappedOutPss];
		}

		/** @hide */
		public static String getOtherLabel(int which) {
		switch (which) {
		@@ -632,12 +661,24 @@ public final class Debug
		* know if the Swap memory is shared or private, so we don't know
		* what to blame on the application and what on the system.
		* For now, just lump all the Swap in one place.
		* For kernels reporting SwapPss {@link #getSummaryTotalSwapPss()}
		* will report the application proportional Swap.
		* @hide
		*/
		public int getSummaryTotalSwap() {
		return getTotalSwappedOut();
		}

		/**
		* Total proportional Swap in KB.
		* Notes:
		* * Always 0 if {@link #hasSwappedOutPss} is false.
		* @hide
		*/
		public int getSummaryTotalSwapPss() {
		return getTotalSwappedOutPss();
		}

		public int describeContents() {
		return 0;
		}
		@@ -664,6 +705,8 @@ public final class Debug
		dest.writeInt(otherPrivateClean);
		dest.writeInt(otherSharedClean);
		dest.writeInt(otherSwappedOut);
		dest.writeInt(hasSwappedOutPss ? 1 : 0);
		dest.writeInt(otherSwappedOutPss);
		dest.writeIntArray(otherStats);
		}

		@@ -689,6 +732,8 @@ public final class Debug
		otherPrivateClean = source.readInt();
		otherSharedClean = source.readInt();
		otherSwappedOut = source.readInt();
		hasSwappedOutPss = source.readInt() != 0;
		otherSwappedOutPss = source.readInt();
		otherStats = source.createIntArray();
		}

		@@ -1563,11 +1608,12 @@ href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Lo

		/**
		* Retrieves the PSS memory used by the process as given by the
		* smaps. Optionally supply a long array of 1 entry to also
		* receive the uss of the process, and another array to also
		* retrieve the separate memtrack size. @hide
		* smaps. Optionally supply a long array of 2 entries to also
		* receive the Uss and SwapPss of the process, and another array to also
		* retrieve the separate memtrack size.
		* @hide
		*/
		public static native long getPss(int pid, long[] outUss, long[] outMemtrack);
		public static native long getPss(int pid, long[] outUssSwapPss, long[] outMemtrack);

		/** @hide */
		public static final int MEMINFO_TOTAL = 0;

core/jni/android_os_Debug.cpp

+49 −16

File changed.

Preview size limit exceeded, changes collapsed.

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

+89 −29

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -100,6 +100,6 @@ option java_package com.android.server.am
		30045 am_pre_boot (User\|1\|5),(Package\|3)

		# Report collection of global memory state
		30046 am_meminfo (CachedKb\|2\|2),(FreeKb\|2\|2),(ZramKb\|2\|2),(KernelKb\|2\|2),(NativeKb\|2\|2)
		30046 am_meminfo (Cached\|2\|2),(Free\|2\|2),(Zram\|2\|2),(Kernel\|2\|2),(Native\|2\|2)
		# Report collection of memory used by a process
		30047 am_pss (Pid\|1\|5),(UID\|1\|5),(Process Name\|3),(PssKb\|2\|2),(UssKb\|2\|2)
		30047 am_pss (Pid\|1\|5),(UID\|1\|5),(Process Name\|3),(Pss\|2\|2),(Uss\|2\|2),(SwapPss\|2\|2)