diff options
| author | Yu Liu <e7664c@motorola.com> | 2015-06-18 10:46:29 -0700 |
|---|---|---|
| committer | Yu Liu <e7664c@motorola.com> | 2015-06-18 10:46:29 -0700 |
| commit | 28872b21627c77b8fb2f295f1090619fc00b801f (patch) | |
| tree | 199192161c3d77107094538c62567833465b05d6 | |
| parent | b9408add5aea2ce30602392602948ba9c364fe6e (diff) | |
| download | extras-28872b21627c77b8fb2f295f1090619fc00b801f.tar.gz | |
Swap column in procrank not reported with swap enabled
| -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"); |