diff options
| author | Colin Cross <ccross@android.com> | 2013-06-11 00:44:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-11 00:44:26 +0000 |
| commit | aae2a03f6a2cf6774a719182b1dc02fdf863777f (patch) | |
| tree | 09108cd74e7e56afaa34102d71ee83336cb9a7a4 | |
| parent | 91f4410f49f8f701f9001c447b5bc6162c348f6b (diff) | |
| parent | ad0b50bf21b04d64d56213014565d6e92d1c562e (diff) | |
| download | extras-aae2a03f6a2cf6774a719182b1dc02fdf863777f.tar.gz | |
Merge "libpagemap: fix vss calculation"
| -rw-r--r-- | libpagemap/pm_map.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpagemap/pm_map.c b/libpagemap/pm_map.c index 2d5c2f90..ef9e2ce6 100644 --- a/libpagemap/pm_map.c +++ b/libpagemap/pm_map.c @@ -43,6 +43,8 @@ int pm_map_usage(pm_map_t *map, pm_memusage_t *usage_out) { pm_memusage_zero(&usage); for (i = 0; i < len; i++) { + usage.vss += map->proc->ker->pagesize; + if (!PM_PAGEMAP_PRESENT(pagemap[i]) || PM_PAGEMAP_SWAPPED(pagemap[i])) continue; @@ -51,7 +53,6 @@ int pm_map_usage(pm_map_t *map, pm_memusage_t *usage_out) { &count); if (error) goto out; - usage.vss += map->proc->ker->pagesize; usage.rss += (count >= 1) ? (map->proc->ker->pagesize) : (0); usage.pss += (count >= 1) ? (map->proc->ker->pagesize / count) : (0); usage.uss += (count == 1) ? (map->proc->ker->pagesize) : (0); |