Hello community,
here is the log from the commit of package procps for openSUSE:Factory checked
in at 2015-11-17 14:19:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2015-09-24
07:17:29.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2015-11-17
14:19:23.000000000 +0100
@@ -1,0 +2,7 @@
+Tue Nov 10 11:56:23 UTC 2015 - wer...@suse.de
+
+- Pmap: support "SwapPss" which shows proportional swap share
+ of a process similar to the PSS (proportional set size)
+ of a process which is the count of pages it has in memory.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps-pmap-legacy.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procps-pmap-legacy/pmap.c
new/procps-pmap-legacy/pmap.c
--- old/procps-pmap-legacy/pmap.c 2015-09-18 15:14:11.000000000 +0200
+++ new/procps-pmap-legacy/pmap.c 2015-11-10 12:52:18.000000000 +0100
@@ -10,7 +10,7 @@
* published by the Free Software Foundation
*
* Copyright (C) 2003, 2005 Chris Rivera
- * Copyright (C) 2009, 2012 Werner Fink
+ * Copyright (C) 2009, 2012, 2015 Werner Fink
*/
#include <stdio.h>
@@ -49,6 +49,7 @@
{ "Anonymous", 0, 0, 0},
{ "AnonHugePages", 0, 0, 0},
{ "Swap", 0, 0, 0},
+ { "SwapPss", 0, 0, 0},
{ "KernelPageSize", 0, 0, 0},
{ "MMUPageSize", 0, 0, 0},
{ "Locked", 0, 0, 0},
@@ -69,6 +70,7 @@
Anonymous,
AnonHugePages,
Swap,
+ SwapPss,
KernelPageSize,
MMUPageSize,
Locked,
@@ -211,6 +213,8 @@
printf(" DIRTY ");
if (smap[Swap].has)
printf(" SWAP ");
+ if (smap[SwapPss].has)
+ printf("SWAPPSS ");
}
if (show_devices)
@@ -238,6 +242,8 @@
printf("%6luK ", smap[Private_Dirty].data +
smap[Shared_Dirty].data);
if (smap[Swap].has)
printf("%6luK ", smap[Swap].data);
+ if (smap[SwapPss].has)
+ printf("%6luK ", smap[SwapPss].data);
}
printf("%c%c%c%c ", read_perm, write_perm, exec_perm, access_type);
@@ -350,8 +356,11 @@
perror("strtoul");
exit(EXIT_FAILURE);
}
-
+#if defined(DO_TEST) && (DO_TEST > 0)
+ snprintf(path, PATH_MAX, "/proc/%d/maps", pid);
+#else
snprintf(path, PATH_MAX, "/proc/%d/maps", pid);
+#endif
fp = fopen(path, "r");
if (!fp) {
if (errno != ENOENT) {
@@ -388,6 +397,8 @@
printf(" %6luK", smap[Shared_Dirty].total +
smap[Private_Dirty].total);
if (smap[Swap].has)
printf(" %6luK", smap[Swap].total);
+ if (smap[SwapPss].has)
+ printf(" %6luK", smap[SwapPss].total);
printf("\n\n");
} else
printf("mapped: %luK ", mapped);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/procps-pmap-legacy/test new/procps-pmap-legacy/test
--- old/procps-pmap-legacy/test 2013-10-07 14:46:33.000000000 +0200
+++ new/procps-pmap-legacy/test 2015-11-10 12:50:08.000000000 +0100
@@ -1,36 +1,55 @@
-10000000-100d0000 r-xp 00000000 fd:00 1228802
/bin/bash
-Size: 832 kB
-Rss: 768 kB
-Pss: 768 kB
+10000000-10110000 r-xp 00000000 fd:00 160002
/bin/bash
+Size: 1088 kB
+Rss: 960 kB
+Pss: 960 kB
Shared_Clean: 0 kB
Shared_Dirty: 0 kB
-Private_Clean: 768 kB
+Private_Clean: 960 kB
Private_Dirty: 0 kB
-Referenced: 768 kB
+Referenced: 960 kB
Anonymous: 0 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd ex mr mw me dw
-100d0000-100f0000 rw-p 000c0000 fd:00 1228802
/bin/bash
-Size: 128 kB
-Rss: 128 kB
-Pss: 128 kB
+10110000-10120000 r--p 00100000 fd:00 160002
/bin/bash
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
Shared_Clean: 0 kB
Shared_Dirty: 0 kB
Private_Clean: 0 kB
-Private_Dirty: 128 kB
-Referenced: 128 kB
-Anonymous: 128 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
+KernelPageSize: 64 kB
+MMUPageSize: 64 kB
+Locked: 0 kB
+VmFlags: rd mr mw me dw ac
+10120000-10130000 rw-p 00110000 fd:00 160002
/bin/bash
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
+AnonHugePages: 0 kB
+Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me dw ac
-1000d8a0000-1000d8d0000 rw-p 00000000 00:00 0 [heap]
+1002fe00000-1002fe30000 rw-p 00000000 00:00 0 [heap]
Size: 192 kB
Rss: 64 kB
Pss: 64 kB
@@ -42,62 +61,83 @@
Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me ac
-1fffffca0000-1fffffcc0000 rw-p 00000000 00:00 0
-Size: 128 kB
-Rss: 128 kB
-Pss: 128 kB
+3fff7fb70000-3fff7fb80000 rw-p 00000000 00:00 0
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
Shared_Clean: 0 kB
Shared_Dirty: 0 kB
Private_Clean: 0 kB
-Private_Dirty: 128 kB
-Referenced: 128 kB
-Anonymous: 128 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me ac
-1fffffcc0000-1fffffe80000 r-xp 00000000 fd:00 819208
/lib64/libc-2.18.so
-Size: 1792 kB
-Rss: 1408 kB
-Pss: 322 kB
-Shared_Clean: 1344 kB
+3fff7fb80000-3fff7fd30000 r-xp 00000000 fd:00 32008
/lib64/libc-2.22.so
+Size: 1728 kB
+Rss: 1280 kB
+Pss: 330 kB
+Shared_Clean: 1216 kB
Shared_Dirty: 0 kB
Private_Clean: 64 kB
Private_Dirty: 0 kB
-Referenced: 1408 kB
+Referenced: 1280 kB
Anonymous: 0 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd ex mr mw me
-1fffffe80000-1fffffea0000 rw-p 001b0000 fd:00 819208
/lib64/libc-2.18.so
-Size: 128 kB
-Rss: 128 kB
-Pss: 128 kB
+3fff7fd30000-3fff7fd40000 r--p 001a0000 fd:00 32008
/lib64/libc-2.22.so
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
Shared_Clean: 0 kB
Shared_Dirty: 0 kB
Private_Clean: 0 kB
-Private_Dirty: 128 kB
-Referenced: 128 kB
-Anonymous: 128 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
+KernelPageSize: 64 kB
+MMUPageSize: 64 kB
+Locked: 0 kB
+VmFlags: rd mr mw me ac
+3fff7fd40000-3fff7fd50000 rw-p 001b0000 fd:00 32008
/lib64/libc-2.22.so
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
+AnonHugePages: 0 kB
+Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me ac
-1fffffea0000-1fffffeb0000 r-xp 00000000 fd:00 819214
/lib64/libdl-2.18.so
+3fff7fd50000-3fff7fd60000 r-xp 00000000 fd:00 32014
/lib64/libdl-2.22.so
Size: 64 kB
Rss: 64 kB
-Pss: 16 kB
+Pss: 21 kB
Shared_Clean: 64 kB
Shared_Dirty: 0 kB
Private_Clean: 0 kB
@@ -106,11 +146,29 @@
Anonymous: 0 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd ex mr mw me
-1fffffeb0000-1fffffec0000 rw-p 00000000 fd:00 819214
/lib64/libdl-2.18.so
+3fff7fd60000-3fff7fd70000 r--p 00000000 fd:00 32014
/lib64/libdl-2.22.so
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
+AnonHugePages: 0 kB
+Swap: 0 kB
+SwapPss: 0 kB
+KernelPageSize: 64 kB
+MMUPageSize: 64 kB
+Locked: 0 kB
+VmFlags: rd mr mw me ac
+3fff7fd70000-3fff7fd80000 rw-p 00010000 fd:00 32014
/lib64/libdl-2.22.so
Size: 64 kB
Rss: 64 kB
Pss: 64 kB
@@ -122,27 +180,29 @@
Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me ac
-1fffffec0000-1ffffff00000 r-xp 00000000 fd:00 819260
/lib64/libtinfo.so.5.9
-Size: 256 kB
-Rss: 128 kB
-Pss: 128 kB
+3fff7fd80000-3fff7fdb0000 r-xp 00000000 fd:00 32064
/lib64/libtinfo.so.6.0
+Size: 192 kB
+Rss: 64 kB
+Pss: 64 kB
Shared_Clean: 0 kB
Shared_Dirty: 0 kB
-Private_Clean: 128 kB
+Private_Clean: 64 kB
Private_Dirty: 0 kB
-Referenced: 128 kB
+Referenced: 64 kB
Anonymous: 0 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd ex mr mw me
-1ffffff00000-1ffffff10000 rw-p 00030000 fd:00 819260
/lib64/libtinfo.so.5.9
+3fff7fdb0000-3fff7fdc0000 r--p 00020000 fd:00 32064
/lib64/libtinfo.so.6.0
Size: 64 kB
Rss: 64 kB
Pss: 64 kB
@@ -154,43 +214,80 @@
Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
+KernelPageSize: 64 kB
+MMUPageSize: 64 kB
+Locked: 0 kB
+VmFlags: rd mr mw me ac
+3fff7fdc0000-3fff7fdd0000 rw-p 00030000 fd:00 32064
/lib64/libtinfo.so.6.0
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
+AnonHugePages: 0 kB
+Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me ac
-1ffffff10000-1ffffff70000 r-xp 00000000 fd:00 819265
/lib64/libreadline.so.6.2
+3fff7fdd0000-3fff7fe30000 r-xp 00000000 fd:00 32069
/lib64/libreadline.so.6.3
Size: 384 kB
-Rss: 192 kB
-Pss: 192 kB
+Rss: 128 kB
+Pss: 128 kB
Shared_Clean: 0 kB
Shared_Dirty: 0 kB
-Private_Clean: 192 kB
+Private_Clean: 128 kB
Private_Dirty: 0 kB
-Referenced: 192 kB
+Referenced: 128 kB
Anonymous: 0 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd ex mr mw me
-1ffffff70000-1ffffff90000 rw-p 00050000 fd:00 819265
/lib64/libreadline.so.6.2
-Size: 128 kB
-Rss: 128 kB
-Pss: 128 kB
+3fff7fe30000-3fff7fe40000 r--p 00050000 fd:00 32069
/lib64/libreadline.so.6.3
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
Shared_Clean: 0 kB
Shared_Dirty: 0 kB
Private_Clean: 0 kB
-Private_Dirty: 128 kB
-Referenced: 128 kB
-Anonymous: 128 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
+KernelPageSize: 64 kB
+MMUPageSize: 64 kB
+Locked: 0 kB
+VmFlags: rd mr mw me ac
+3fff7fe40000-3fff7fe50000 rw-p 00060000 fd:00 32069
/lib64/libreadline.so.6.3
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
+AnonHugePages: 0 kB
+Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me ac
-1ffffff90000-1ffffffa0000 rw-p 00000000 00:00 0
+3fff7fe50000-3fff7fe60000 rw-p 00000000 00:00 0
Size: 64 kB
Rss: 64 kB
Pss: 64 kB
@@ -202,11 +299,12 @@
Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me ac
-1ffffffa0000-1ffffffc0000 r-xp 00000000 00:00 0 [vdso]
+3fff7fe60000-3fff7fe80000 r-xp 00000000 00:00 0 [vdso]
Size: 128 kB
Rss: 128 kB
Pss: 19 kB
@@ -218,14 +316,15 @@
Anonymous: 0 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd ex mr mw me de
-1ffffffc0000-1fffffff0000 r-xp 00000000 fd:00 819320
/lib64/ld-2.18.so
+3fff7fe80000-3fff7feb0000 r-xp 00000000 fd:00 32123
/lib64/ld-2.22.so
Size: 192 kB
Rss: 192 kB
-Pss: 31 kB
+Pss: 38 kB
Shared_Clean: 192 kB
Shared_Dirty: 0 kB
Private_Clean: 0 kB
@@ -234,11 +333,29 @@
Anonymous: 0 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd ex mr mw me dw
-1fffffff0000-200000000000 rw-p 00020000 fd:00 819320
/lib64/ld-2.18.so
+3fff7feb0000-3fff7fec0000 r--p 00020000 fd:00 32123
/lib64/ld-2.22.so
+Size: 64 kB
+Rss: 64 kB
+Pss: 64 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 64 kB
+Referenced: 64 kB
+Anonymous: 64 kB
+AnonHugePages: 0 kB
+Swap: 0 kB
+SwapPss: 0 kB
+KernelPageSize: 64 kB
+MMUPageSize: 64 kB
+Locked: 0 kB
+VmFlags: rd mr mw me dw ac
+3fff7fec0000-3fff7fed0000 rw-p 00030000 fd:00 32123
/lib64/ld-2.22.so
Size: 64 kB
Rss: 64 kB
Pss: 64 kB
@@ -250,11 +367,12 @@
Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
VmFlags: rd wr mr mw me dw ac
-3fffff860000-3fffff890000 rw-p 00000000 00:00 0
[stack]
+3fffffc10000-3fffffc40000 rw-p 00000000 00:00 0
[stack]
Size: 256 kB
Rss: 64 kB
Pss: 64 kB
@@ -266,6 +384,7 @@
Anonymous: 64 kB
AnonHugePages: 0 kB
Swap: 0 kB
+SwapPss: 0 kB
KernelPageSize: 64 kB
MMUPageSize: 64 kB
Locked: 0 kB
