Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include KReclaimable meminfo field into getMemInfo results" am: f61d2347c0 am: 215e1d5e27

Browse Source 
Change-Id: I7a5b775b93ce3c345d376b4c2e9dfa6ebde31848
This commit is contained in:
Automerger Merge Worker
2019-12-19 06:22:00 +00:00
parent 5faef1b60a 215e1d5e27
commit d23e6f7b09
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/os/Debug.java
View File

@@ -1874,8 +1874,14 @@ public final class Debug
public static final int MEMINFO_PAGE_TABLES = 13; public static final int MEMINFO_PAGE_TABLES = 13;
/** @hide */ /** @hide */
public static final int MEMINFO_KERNEL_STACK = 14; public static final int MEMINFO_KERNEL_STACK = 14;
/**
* Note: MEMINFO_KRECLAIMABLE includes MEMINFO_SLAB_RECLAIMABLE (see KReclaimable field
* description in kernel documentation).
* @hide
*/
public static final int MEMINFO_KRECLAIMABLE = 15;
/** @hide */ /** @hide */
public static final int MEMINFO_COUNT = 15; public static final int MEMINFO_COUNT = 16;
/** /**
* Retrieves /proc/meminfo. outSizes is filled with fields * Retrieves /proc/meminfo. outSizes is filled with fields

1
core/jni/android_os_Debug.cpp
View File

@@ -560,6 +560,7 @@ enum {
MEMINFO_VMALLOC_USED, MEMINFO_VMALLOC_USED,
MEMINFO_PAGE_TABLES, MEMINFO_PAGE_TABLES,
MEMINFO_KERNEL_STACK, MEMINFO_KERNEL_STACK,
MEMINFO_KERNEL_RECLAIMABLE,
MEMINFO_COUNT MEMINFO_COUNT
}; };