commit | 5a347195dfb08efb4b2deef7aa5b2740da4abc9e | [log] [tgz] |
---|---|---|
author | Ryan Prichard <rprichard@google.com> | Mon Jun 17 17:58:46 2019 -0700 |
committer | Ryan Prichard <rprichard@google.com> | Tue Jul 23 02:07:04 2019 +0000 |
tree | fa4c1ec3b4c6419f87ba67aa4606017ee517fd28 | |
parent | a367e0e4fa7f1eacbf7dbad93f6b3c00cf469587 [diff] |
Categorize [anon:stack_and_tls:{}] as stack memory Bug: http://b/134795155 Test: run "dumpsys meminfo" and verify that this CL increases the reported stack memory usage Change-Id: Id929671d6c52ba92b4ea11c83297f3af3ced89e4 Merged-In: Id929671d6c52ba92b4ea11c83297f3af3ced89e4
diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 62c4d76..bbd8ffe 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp
@@ -306,6 +306,8 @@ whichHeap = HEAP_NATIVE; } else if (strncmp(name, "[stack", 6) == 0) { whichHeap = HEAP_STACK; + } else if (strncmp(name, "[anon:stack_and_tls:", 20) == 0) { + whichHeap = HEAP_STACK; } else if (nameLen > 3 && strcmp(name+nameLen-3, ".so") == 0) { whichHeap = HEAP_SO; is_swappable = true;