collect dumpsys meminfo output

Change-Id: I9ba3cf1375e690aae112aac37e2e2692991bc3b7
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

1 files changed, 22 insertions, 14 deletions

diff --git a/android/scripts/application-benchmark.sh b/android/scripts/application-benchmark.sh
index 314c782..93478f1 100755
--- a/android/scripts/application-benchmark.sh
+++ b/android/scripts/application-benchmark.sh
@@ -23,6 +23,7 @@ f_procrank="${dir_rawdata}/activity_procrank.raw"
 f_stat="${dir_rawdata}/activity_stat.raw"
 f_procmem="${dir_rawdata}/activity_procmem.raw"
 f_maps="${dir_rawdata}/activity_maps.raw"
+f_dumpsys_mem="${dir_rawdata}/activity_dumpsys_meminfo.raw"
 
 f_res_starttime="${dir_rawdata}/activity_starttime.csv"
 f_res_mem="${dir_rawdata}/activity_mem.csv"
@@ -131,6 +132,26 @@ collect_streamline_data_post(){
     #streamline -report -function ${apd_f} |tee ${parent_dir}/streamlineReport.txt
 }
 
+collect_mem_raw_data(){
+    # get memory info
+    adb shell ps|grep "${app_package}" >>"${f_mem}"
+    adb shell su 0 procrank|grep "${app_package}" >> "${f_procrank}"
+
+    echo "===package=${app_package}, count=${count} start" >> "${f_dumpsys_mem}"
+    adb shell su 0 dumpsys meminfo "${app_package}" >> "${f_dumpsys_mem}"
+    echo "===package=${app_package}, count=${count} end" >> "${f_dumpsys_mem}"
+
+    pid=$(adb shell ps|grep ${app_package}|awk '{print $2}')
+    if [ -n "${pid}" ]; then
+        adb shell su 0 cat /proc/${pid}/stat >> "${f_stat}"
+        echo "===pid=${pid}, package=${app_package}, count=${count} start" >> "${f_maps}"
+        adb shell su 0 cat /proc/${pid}/maps >> "${f_maps}"
+        echo "===pid=${pid}, package=${app_package}, count=${count} end" >> "${f_maps}"
+
+        collect_raw_procmem_data
+    fi
+}
+
 collect_raw_data(){
     local pid=""
     rm -fr "${f_starttime}" "${f_mem}" "${f_cpu}" "${f_procrank}" "${f_stat}" "${f_procmem}" "${f_procmem}_m" "${f_procmem}_p"
@@ -178,20 +199,7 @@ collect_raw_data(){
             # get activity start time information
             adb logcat -d|grep "Displayed ${app_start_activity}" >>"${f_starttime}"
 
-            # get memory info
-            adb shell ps|grep "${app_package}" >>"${f_mem}"
-            adb shell su 0 procrank|grep "${app_package}" >> "${f_procrank}"
-
-            pid=$(adb shell ps|grep ${app_package}|awk '{print $2}')
-            if [ -n "${pid}" ]; then
-                adb shell su 0 cat /proc/${pid}/stat >> "${f_stat}"
-                echo "===pid=${pid}, package=${app_package}, count=${count} start" >> "${f_maps}"
-                adb shell su 0 cat /proc/${pid}/maps >> "${f_maps}"
-                echo "===pid=${pid}, package=${app_package}, count=${count} end" >> "${f_maps}"
-
-                collect_raw_procmem_data
-            fi
-
+            collect_mem_raw_data
 
             # capture screen shot
             adb shell screencap /data/local/tmp/app_screen.png