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

Merge "Incorporate slab reclaimable into meminfo" into oc-mr1-dev

Browse Source
This commit is contained in:
Patrik Torstensson
2017-10-13 01:30:40 +00:00
committed by Android (Google) Code Review
parent eb98edfb83 5e099800f8
commit 20fb01eb23
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1748,22 +1748,26 @@ public final class Debug
public static final int MEMINFO_SHMEM = 4; public static final int MEMINFO_SHMEM = 4;
/** @hide */ /** @hide */
public static final int MEMINFO_SLAB = 5; public static final int MEMINFO_SLAB = 5;
/** @hide */
public static final int MEMINFO_SLAB_RECLAIMABLE = 6;
/** @hide */
public static final int MEMINFO_SLAB_UNRECLAIMABLE = 7;
/** @hide */ /** @hide */
public static final int MEMINFO_SWAP_TOTAL = 6; public static final int MEMINFO_SWAP_TOTAL = 8;
/** @hide */ /** @hide */
public static final int MEMINFO_SWAP_FREE = 7; public static final int MEMINFO_SWAP_FREE = 9;
/** @hide */ /** @hide */
public static final int MEMINFO_ZRAM_TOTAL = 8; public static final int MEMINFO_ZRAM_TOTAL = 10;
/** @hide */ /** @hide */
public static final int MEMINFO_MAPPED = 9; public static final int MEMINFO_MAPPED = 11;
/** @hide */ /** @hide */
public static final int MEMINFO_VM_ALLOC_USED = 10; public static final int MEMINFO_VM_ALLOC_USED = 12;
/** @hide */ /** @hide */
public static final int MEMINFO_PAGE_TABLES = 11; public static final int MEMINFO_PAGE_TABLES = 13;
/** @hide */ /** @hide */
public static final int MEMINFO_KERNEL_STACK = 12; public static final int MEMINFO_KERNEL_STACK = 14;
/** @hide */ /** @hide */
public static final int MEMINFO_COUNT = 13; public static final int MEMINFO_COUNT = 15;
/** /**
* Retrieves /proc/meminfo. outSizes is filled with fields * Retrieves /proc/meminfo. outSizes is filled with fields

4
core/java/com/android/internal/util/MemInfoReader.java
View File

@@ -82,7 +82,7 @@ public final class MemInfoReader {
* that are mapped in to processes. * that are mapped in to processes.
*/ */
public long getCachedSizeKb() { public long getCachedSizeKb() {
return mInfos[Debug.MEMINFO_BUFFERS] return mInfos[Debug.MEMINFO_BUFFERS] + mInfos[Debug.MEMINFO_SLAB_RECLAIMABLE]
+ mInfos[Debug.MEMINFO_CACHED] - mInfos[Debug.MEMINFO_MAPPED]; + mInfos[Debug.MEMINFO_CACHED] - mInfos[Debug.MEMINFO_MAPPED];
} }
@@ -90,7 +90,7 @@ public final class MemInfoReader {
* Amount of RAM that is in use by the kernel for actual allocations. * Amount of RAM that is in use by the kernel for actual allocations.
*/ */
public long getKernelUsedSizeKb() { public long getKernelUsedSizeKb() {
return mInfos[Debug.MEMINFO_SHMEM] + mInfos[Debug.MEMINFO_SLAB] return mInfos[Debug.MEMINFO_SHMEM] + mInfos[Debug.MEMINFO_SLAB_UNRECLAIMABLE]
+ mInfos[Debug.MEMINFO_VM_ALLOC_USED] + mInfos[Debug.MEMINFO_PAGE_TABLES] + mInfos[Debug.MEMINFO_VM_ALLOC_USED] + mInfos[Debug.MEMINFO_PAGE_TABLES]
+ mInfos[Debug.MEMINFO_KERNEL_STACK]; + mInfos[Debug.MEMINFO_KERNEL_STACK];
} }

8
core/jni/android_os_Debug.cpp
View File

@@ -705,6 +705,8 @@ enum {
MEMINFO_CACHED, MEMINFO_CACHED,
MEMINFO_SHMEM, MEMINFO_SHMEM,
MEMINFO_SLAB, MEMINFO_SLAB,
MEMINFO_SLAB_RECLAIMABLE,
MEMINFO_SLAB_UNRECLAIMABLE,
MEMINFO_SWAP_TOTAL, MEMINFO_SWAP_TOTAL,
MEMINFO_SWAP_FREE, MEMINFO_SWAP_FREE,
MEMINFO_ZRAM_TOTAL, MEMINFO_ZRAM_TOTAL,
@@ -776,6 +778,8 @@ static void android_os_Debug_getMemInfo(JNIEnv *env, jobject clazz, jlongArray o
"Cached:", "Cached:",
"Shmem:", "Shmem:",
"Slab:", "Slab:",
"SReclaimable:",
"SUnreclaim:",
"SwapTotal:", "SwapTotal:",
"SwapFree:", "SwapFree:",
"ZRam:", "ZRam:",
@@ -792,6 +796,8 @@ static void android_os_Debug_getMemInfo(JNIEnv *env, jobject clazz, jlongArray o
7, 7,
6, 6,
5, 5,
13,
11,
10, 10,
9, 9,
5, 5,
@@ -801,7 +807,7 @@ static void android_os_Debug_getMemInfo(JNIEnv *env, jobject clazz, jlongArray o
12, 12,
0 0
}; };
long mem[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; long mem[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
char* p = buffer; char* p = buffer;
while (*p && numFound < (sizeof(tagsLen) / sizeof(tagsLen[0]))) { while (*p && numFound < (sizeof(tagsLen) / sizeof(tagsLen[0]))) {