commit 28872b21627c77b8fb2f295f1090619fc00b801f
author Yu Liu <e7664c@motorola.com> Thu Jun 18 10:46:29 2015 -0700
committer Yu Liu <e7664c@motorola.com> Thu Jun 18 10:46:29 2015 -0700
tree 199192161c3d77107094538c62567833465b05d6
parent b9408add5aea2ce30602392602948ba9c364fe6e

Swap column in procrank not reported with swap enabled

libpagemap/pm_map.c

diff --git a/libpagemap/pm_map.c b/libpagemap/pm_map.c
index a65d315..c6a1798 100644
--- a/libpagemap/pm_map.c
+++ b/libpagemap/pm_map.c
@@ -46,7 +46,8 @@
     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])) {

procrank/procrank.c

diff --git a/procrank/procrank.c b/procrank/procrank.c
index de26cd1..1728467 100644
--- a/procrank/procrank.c
+++ b/procrank/procrank.c
@@ -324,7 +324,7 @@
     }
 
     if (has_swap) {
-        printf("%6" PRIu64 "K  ", total_swap);
+        printf("%6" PRIu64 "K  ", total_swap / 1024);
     }
 
     printf("TOTAL\n");