Hello community,
here is the log from the commit of package procps for openSUSE:Factory checked
in at 2016-06-03 16:35:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/procps (Old)
and /work/SRC/openSUSE:Factory/.procps.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps"
Changes:
--------
--- /work/SRC/openSUSE:Factory/procps/procps.changes 2016-01-28
17:18:02.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2016-06-03
16:35:44.000000000 +0200
@@ -1,0 +2,5 @@
+Mon May 30 11:44:59 UTC 2016 - wer...@suse.de
+
+- Avoid line doubling of pmap output due new SwapPss entry (boo#982090)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps-ng-3.3.11-pmap4suse.patch ++++++
--- /var/tmp/diff_new_pack.RHutbi/_old 2016-06-03 16:35:45.000000000 +0200
+++ /var/tmp/diff_new_pack.RHutbi/_new 2016-06-03 16:35:45.000000000 +0200
@@ -1,9 +1,9 @@
---
- pmap.c | 46 +++++++++++++++++++++++++++++++++++-----------
- 1 file changed, 35 insertions(+), 11 deletions(-)
+ pmap.c | 50 +++++++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 37 insertions(+), 13 deletions(-)
--- pmap.c
-+++ pmap.c 2016-01-27 09:16:14.924460617 +0000
++++ pmap.c 2016-05-30 11:36:45.447592219 +0000
@@ -48,7 +48,9 @@ const char *nls_Address,
*nls_Kbytes,
*nls_Mode,
@@ -85,12 +85,14 @@
if (strncmp("Shared_Dirty", smap_key, 12) == 0)
{
shared_dirty = smap_value;
total_shared_dirty += smap_value;
-@@ -616,12 +632,15 @@ static int one_proc(proc_t * p)
+@@ -615,17 +631,20 @@ static int one_proc(proc_t * p)
+ total_private_dirty += smap_value;
continue;
}
- if (strncmp("Swap", smap_key, 4) == 0) {
+- if (strncmp("Swap", smap_key, 4) == 0) {
- /*doesn't matter as long as last */
- printf("%0*" KLF "x %*lu %*llu %*llu
%*s %s\n",
++ if (strncmp("Swap", smap_key, 4) == 0 &&
strlen(smap_key) == 4) {
+ swap = smap_value;
+ total_swap += smap_value;
+ printf("%0*" KLF "x %*lu %*llu %*llu
%*llu %*llu %*s %s\n",
@@ -103,6 +105,11 @@
maxw5, perms,
cp2);
/* reset some counters */
+- rss = shared_dirty = private_dirty =
0ull;
++ rss = pss = shared_dirty =
private_dirty = swap = 0ull;
+ diff = 0;
+ continue;
+ }
@@ -656,7 +675,6 @@ static int one_proc(proc_t * p)
if (perms[3] == 's')
total_shared += diff;
