From 49813529f7ba0845ae27fe7e03a85e673a4e2385 Mon Sep 17 00:00:00 2001 From: Minchan Kim Date: Tue, 9 Jul 2019 11:57:41 +0900 Subject: [PATCH] skip reading vmallocinfo if not needed If kernel supports vmalloc memory accouting from /proc/meminfo (https://patchwork.kernel.org/patch/10944111/) it's pointless to parse /proc/vmallocinfo since it's too heavy Bug: 136688885 Test: manual checking right vmalloc pages from meminfo Test: manual checking check that never invokes ReadVmallocInfo if kernel supports vmalloc pages Change-Id: I725ea1f8a0c4ab07e78893fdb39661a65eac39e6 Signed-off-by: Minchan Kim --- core/jni/android_os_Debug.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/jni/android_os_Debug.cpp b/core/jni/android_os_Debug.cpp index 14dbabb1ce022..c3e7a36bef78a 100644 --- a/core/jni/android_os_Debug.cpp +++ b/core/jni/android_os_Debug.cpp @@ -575,7 +575,7 @@ static void android_os_Debug_getMemInfo(JNIEnv *env, jobject clazz, jlongArray o if (outArray != NULL) { outLen = MEMINFO_COUNT; for (int i = 0; i < outLen; i++) { - if (i == MEMINFO_VMALLOC_USED) { + if (i == MEMINFO_VMALLOC_USED && mem[i] == 0) { outArray[i] = smi.ReadVmallocInfo() / 1024; continue; }