diff options
| author | Yu Liu <e7664c@motorola.com> | 2015-06-18 10:46:29 -0700 |
|---|---|---|
| committer | Thierry Strudel <tstrudel@google.com> | 2015-11-20 14:51:30 -0800 |
| commit | aa5a7df9d83c39e41fd07c1281a9912544022448 (patch) | |
| tree | c941bbd50c458a065709b35782ab82c508b53777 | |
| parent | f7023afac4595a23e29c7dcb9a6f6a847051551c (diff) | |
| download | extras-aa5a7df9d83c39e41fd07c1281a9912544022448.tar.gz | |
Swap column in procrank not reported with swap enabled
Bug: 25392275
Change-Id: I6d2a0b03abba555b3667f6ccf12896caeecf27aa
| -rw-r--r-- | libpagemap/pm_map.c | 3 | ||||
| -rw-r--r-- | procrank/procrank.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libpagemap/pm_map.c b/libpagemap/pm_map.c index a65d3154..c6a17981 100644 --- a/libpagemap/pm_map.c +++ b/libpagemap/pm_map.c @@ -46,7 +46,8 @@ int pm_map_usage_flags(pm_map_t *map, pm_memusage_t *usage_out, for (i = 0; i < len; i++) { usage.vss += map->proc->ker->pagesize; - if (!PM_PAGEMAP_PRESENT(pagemap[i])) + if (!PM_PAGEMAP_PRESENT(pagemap[i]) && + !PM_PAGEMAP_SWAPPED(pagemap[i])) continue; if (!PM_PAGEMAP_SWAPPED(pagemap[i])) { diff --git a/procrank/procrank.c b/procrank/procrank.c index de26cd13..17284672 100644 --- a/procrank/procrank.c +++ b/procrank/procrank.c @@ -324,7 +324,7 @@ int main(int argc, char *argv[]) { } if (has_swap) { - printf("%6" PRIu64 "K ", total_swap); + printf("%6" PRIu64 "K ", total_swap / 1024); } printf("TOTAL\n"); |