[procps] fix #532668 - procps/top SWAP statistics makes no sense (adapted patch from Mr. Kosaki)

[Jan Görig]

commit 64ec8da481d6a117fbc10db683f20fe09cee55ff
Author: Jan Görig <jgorig at redhat.com>
Date:   Wed Jun 1 11:51:37 2011 +0200

    fix #532668 - procps/top SWAP statistics makes no sense (adapted patch from Mr. Kosaki)

 procps-3.2.8-top-swap.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 procps.spec                 |    8 +++++++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/procps-3.2.8-top-swap.patch b/procps-3.2.8-top-swap.patch
new file mode 100644
index 0000000..c52aa3b
--- /dev/null
+++ b/procps-3.2.8-top-swap.patch
@@ -0,0 +1,43 @@
+diff --git a/proc/readproc.c b/proc/readproc.c
+index b96d0a4..f71c514 100644
+--- a/proc/readproc.c
++++ b/proc/readproc.c
+@@ -176,6 +176,7 @@ ENTER(0x220);
+     P->vm_stack= 0;
+     P->vm_exe  = 0;
+     P->vm_lib  = 0;
++    P->vm_swap = 0;
+     P->nlwp    = 0;
+     P->signal[0] = '\0';  // so we can detect it as missing for very old kernels
+ 
+diff --git a/top.c b/top.c
+index 6d4a7cc..93db9f0 100644
+--- a/top.c
++++ b/top.c
+@@ -215,7 +215,7 @@ static int sort_P_TME (const proc_t **P, const proc_t **Q)
+ }
+ 
+ SCB_NUM1(P_VRT, size)
+-SCB_NUM2(P_SWP, size, resident)
++SCB_NUM1(P_SWP, vm_swap)
+ SCB_NUM1(P_RES, resident)               // also serves P_MEM !
+ SCB_NUM1(P_COD, trs)
+ SCB_NUM1(P_DAT, drs)
+@@ -1243,7 +1243,7 @@ static FLD_t Fieldstab[] = {
+    { "MmRr", "    TIME+ ",  " %9.9s",    9,    -1, SF(TME), "CPU Time, hundredths", L_stat   },
+    { "NnFf", " %MEM",       " %#4.1f",  -1,    -1, SF(RES), "Memory usage (RES)",   L_statm  },
+    { "OoMm", "  VIRT",      " %5.5s",    5, SK_Kb, SF(VRT), "Virtual Image (kb)",   L_statm  },
+-   { "PpOo", " SWAP",       " %4.4s",    4, SK_Kb, SF(SWP), "Swapped size (kb)",    L_statm  },
++   { "PpOo", " SWAP",       " %4.4s",    4, SK_Kb, SF(SWP), "Swapped size (kb)",    L_status },
+    { "QqTt", "  RES",       " %4.4s",    4, SK_Kb, SF(RES), "Resident size (kb)",   L_statm  },
+    { "RrKk", " CODE",       " %4.4s",    4, SK_Kb, SF(COD), "Code size (kb)",       L_statm  },
+    { "SsLl", " DATA",       " %4.4s",    4, SK_Kb, SF(DAT), "Data+Stack size (kb)", L_statm  },
+@@ -3134,7 +3134,7 @@ static void task_show (const WIN_t *q, const proc_t *p)
+             MKCOL(p->state);
+             break;
+          case P_SWP:
+-            MKCOL(scale_num(PAGES_TO_KB(p->size - p->resident), w, s));
++            MKCOL(scale_num(p->vm_swap, w, s));
+             break;
+          case P_TME:
+          case P_TM2:
diff --git a/procps.spec b/procps.spec
index a7a753d..711164e 100644
--- a/procps.spec
+++ b/procps.spec
@@ -3,7 +3,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.8
-Release: 19.%{gitver}%{?dist}
+Release: 20.%{gitver}%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://gitorious.org/procps
@@ -69,6 +69,8 @@ Patch46: procps-3.2.8-setlocale.patch
 Patch47: procps-pmap-smaps.patch
 #692995 - procps: Regarding FROM field in "w" command
 Patch48: procps-3.2.8-w-envlength.patch
+#532668 - procps/top SWAP statistics makes no sense
+Patch49: procps-3.2.8-top-swap.patch
 
 
 BuildRequires: ncurses-devel
@@ -134,6 +136,7 @@ System and process monitoring utilities development headers
 %patch46 -p1
 %patch47 -p1
 %patch48 -p1
+%patch49 -p1
 
 cp %SOURCE1 .
 
@@ -184,6 +187,9 @@ rm -rf %{buildroot}
 /%{_lib}/libproc.so
 
 %changelog
+* Wed Jun 01 2011 Jan Görig <jgorig at redhat.com> 3.2.8-20.20110302git
+- fix #532668 - procps/top SWAP statistics makes no sense (adapted patch from Mr. Kosaki)
+
 * Thu May 05 2011 Jan Görig <jgorig at redhat.com> 3.2.8-19.20110302git
 - #692995 - w - patch from Debian for specifying USER and FROM length