diff options
| author | Ian Rogers <irogers@google.com> | 2013-02-27 10:57:13 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-02-27 11:34:42 -0800 |
| commit | 7c9f30bfb361ccb864e6d130e0f4f2af53fc1c32 (patch) | |
| tree | 696b2c3378c9ec73e46c84e45814be567aa1e079 /core/java/android | |
| parent | 545464df282273209a837569f05e9990173f4d56 (diff) | |
| download | frameworks_base-7c9f30bfb361ccb864e6d130e0f4f2af53fc1c32.zip frameworks_base-7c9f30bfb361ccb864e6d130e0f4f2af53fc1c32.tar.gz frameworks_base-7c9f30bfb361ccb864e6d130e0f4f2af53fc1c32.tar.bz2 | |
Track stack memory in MemoryInfo.
In /proc/pid/maps the main stack is identified as "[stack]". In Linux 3.4
thread stacks are identified as "[stack:<tid>]" where <tid> is the thread ID of
the thread using that stack. Add support in MemInfo's otherStats to track
memory being used by the stack.
Add sanity check on the length of the otherStats array.
Add detail messages to two null pointer exceptions.
Bug: 8265251
Change-Id: I2b228b147da9bdc5c7a4d825dfc628fcc7923927
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Debug.java | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index 88ebdd5..2e77237 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -130,7 +130,7 @@ public final class Debug public int otherSharedDirty; /** @hide */ - public static final int NUM_OTHER_STATS = 9; + public static final int NUM_OTHER_STATS = 10; private int[] otherStats = new int[NUM_OTHER_STATS*3]; @@ -177,15 +177,16 @@ public final class Debug /* @hide */ public static String getOtherLabel(int which) { switch (which) { - case 0: return "Cursor"; - case 1: return "Ashmem"; - case 2: return "Other dev"; - case 3: return ".so mmap"; - case 4: return ".jar mmap"; - case 5: return ".apk mmap"; - case 6: return ".ttf mmap"; - case 7: return ".dex mmap"; - case 8: return "Other mmap"; + case 0: return "Stack"; + case 1: return "Cursor"; + case 2: return "Ashmem"; + case 3: return "Other dev"; + case 4: return ".so mmap"; + case 5: return ".jar mmap"; + case 6: return ".apk mmap"; + case 7: return ".ttf mmap"; + case 8: return ".dex mmap"; + case 9: return "Other mmap"; default: return "????"; } } |