pool/procps
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/procps?expand=0&rev=155
This commit is contained in:
Dr. Werner Fink 2016-05-30 11:46:28 +00:00 committed by Git OBS Bridge
parent ee6b45288d
commit 9c52a14a34
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
procps-ng-3.3.11-pmap4suse.patch
View File

@ -1,9 +1,9 @@
--- ---
pmap.c | 46 +++++++++++++++++++++++++++++++++++----------- pmap.c | 50 +++++++++++++++++++++++++++++++++++++-------------
1 file changed, 35 insertions(+), 11 deletions(-) 1 file changed, 37 insertions(+), 13 deletions(-)
--- pmap.c --- 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, @@ -48,7 +48,9 @@ const char *nls_Address,
*nls_Kbytes, *nls_Kbytes,
*nls_Mode, *nls_Mode,
@ -85,12 +85,14 @@
if (strncmp("Shared_Dirty", smap_key, 12) == 0) { if (strncmp("Shared_Dirty", smap_key, 12) == 0) {
shared_dirty = smap_value; shared_dirty = smap_value;
total_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; continue;
} }
if (strncmp("Swap", smap_key, 4) == 0) { - if (strncmp("Swap", smap_key, 4) == 0) {
- /*doesn't matter as long as last */ - /*doesn't matter as long as last */
- printf("%0*" KLF "x %*lu %*llu %*llu %*s %s\n", - printf("%0*" KLF "x %*lu %*llu %*llu %*s %s\n",
+ if (strncmp("Swap", smap_key, 4) == 0 && strlen(smap_key) == 4) {
+ swap = smap_value; + swap = smap_value;
+ total_swap += smap_value; + total_swap += smap_value;
+ printf("%0*" KLF "x %*lu %*llu %*llu %*llu %*llu %*s %s\n", + printf("%0*" KLF "x %*lu %*llu %*llu %*llu %*llu %*s %s\n",
@ -103,6 +105,11 @@
maxw5, perms, maxw5, perms,
cp2); cp2);
/* reset some counters */ /* 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) @@ -656,7 +675,6 @@ static int one_proc(proc_t * p)
if (perms[3] == 's') if (perms[3] == 's')
total_shared += diff; total_shared += diff;

5
procps.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 30 11:44:59 UTC 2016 - werner@suse.de
- Avoid line doubling of pmap output due new SwapPss entry (boo#982090)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 27 10:01:13 UTC 2016 - werner@suse.de Wed Jan 27 10:01:13 UTC 2016 - werner@suse.de