Merge "Pull vma.usage.vss updates out of for-loop" am: c08c120d0e am: bb4c752c78 am: 3b36866ed5 am: 81b8cb6c6a
Original change: https://android-review.googlesource.com/c/platform/system/memory/libmeminfo/+/2032744
Change-Id: I6a08b3e91f5d51c99671f86dfe7e98e52e6eed3e
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;
}
