commit 81b8cb6c6aed80730cd41148e4cbb9d10598f8a3
author Kevin Jeon <kevinjeon@google.com> Wed Mar 23 05:53:08 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 23 05:53:08 2022 +0000
tree 28d867aba3e00d8aede73258e1eac65055f63997
parent d8ee68dea4d96c1f2c42544af31e35f15bba225f
parent 3b36866ed5569ac056d162b81b11282444fb8e89

Merge "Pull vma.usage.vss updates out of for-loop" am: c08c120d0e am: bb4c752c78 am: 3b36866ed5

Original change: https://android-review.googlesource.com/c/platform/system/memory/libmeminfo/+/2032744

Change-Id: I22a716853af7a30f5541ddc674ab23f1a0da69b8

procmeminfo.cpp

diff --git a/procmeminfo.cpp b/procmeminfo.cpp
index b22e1bd..13a17da 100644
--- a/procmeminfo.cpp
+++ b/procmeminfo.cpp
@@ -386,10 +386,6 @@
     size_t num_in_page_cache = 0;
     size_t num_leftover_pages = num_pages;
     for (size_t cur_page = first_page; cur_page < first_page + num_pages; ++cur_page) {
-        if (!get_wss) {
-            vma.usage.vss += pagesz;
-        }
-
         // Cache page map data.
         if (cur_page_cache_index == num_in_page_cache) {
             static constexpr size_t kMaxPages = 2048;
@@ -482,6 +478,9 @@
             vma.usage.shared_clean += is_dirty ? 0 : pagesz;
         }
     }
+    if (!get_wss) {
+        vma.usage.vss += pagesz * num_pages;
+    }
     return true;
 }