rpms/procps/devel procps-pmap-smaps.patch, 1.1, 1.2 procps.spec, 1.86, 1.87

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/procps/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28777

Modified Files:
	procps-pmap-smaps.patch procps.spec 
Log Message:
- fixed the last pmap(1) patch


procps-pmap-smaps.patch:
 pmap.c |   87 +++++++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 69 insertions(+), 18 deletions(-)

Index: procps-pmap-smaps.patch
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps-pmap-smaps.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- procps-pmap-smaps.patch	5 Feb 2010 09:53:05 -0000	1.1
+++ procps-pmap-smaps.patch	8 Feb 2010 14:34:22 -0000	1.2
@@ -1,11 +1,7 @@
-Description: provides information for pmap -x option
- Similiar idea to pmap written by Robert Love
-Bug-Debian: http://bugs.debian.org/347476
-Bug-Debian: http://bugs.debian.org/505571
-Author: Craig Small <csmall at debian.org>
---- a/pmap.c
-+++ b/pmap.c
-@@ -126,24 +126,37 @@
+diff -up procps-3.2.7/pmap.c.smap procps-3.2.7/pmap.c
+--- procps-3.2.7/pmap.c.smap	2010-02-08 12:25:08.000000000 +0100
++++ procps-3.2.7/pmap.c	2010-02-08 12:30:13.000000000 +0100
+@@ -123,24 +123,38 @@ static int one_proc(proc_t *p){
    char buf[32];
    char mapbuf[9600];
    char cmdbuf[512];
@@ -21,6 +17,7 @@ Author: Craig Small <csmall at debian.org>
 +  unsigned long long total_rss = 0ull;
 +  unsigned long long total_private_dirty = 0ull;
 +  unsigned long long total_shared_dirty = 0ull;
++  unsigned KLONG diff = 0;
 +
    // Overkill, but who knows what is proper? The "w" prog
    // uses the tty width to determine this.
@@ -46,7 +43,7 @@ Author: Craig Small <csmall at debian.org>
      }
      if(d_option){
        if(sizeof(KLONG)==4) printf("Address   Kbytes Mode  Offset           Device    Mapping\n");
-@@ -151,12 +164,54 @@
+@@ -148,12 +162,54 @@ static int one_proc(proc_t *p){
      }
    }
  
@@ -55,7 +52,7 @@ Author: Craig Small <csmall at debian.org>
      char flags[32];
      char *tmp; // to clean up unprintables
 -    unsigned KLONG start, end, diff;
-+    unsigned KLONG start, end, diff=0;
++    unsigned KLONG start, end;
      unsigned long long file_offset, inode;
      unsigned dev_major, dev_minor;
 +    unsigned long long smap_value;
@@ -101,9 +98,9 @@ Author: Craig Small <csmall at debian.org>
 +      }
 +    }
      sscanf(mapbuf,"%"KLF"x-%"KLF"x %31s %Lx %x:%x %Lu", &start, &end, flags, &file_offset, &dev_major, &dev_minor, &inode);
- 
-     if(start > range_high)
-@@ -186,16 +241,9 @@
+     tmp = strchr(mapbuf,'\n');
+     if(tmp) *tmp='\0';
+@@ -177,16 +233,9 @@ static int one_proc(proc_t *p){
      flags[5] = '\0';
  
      if(x_option){
@@ -123,7 +120,7 @@ Author: Craig Small <csmall at debian.org>
      }
      if(d_option){
        const char *cp = mapping_name(p, start, diff, mapbuf, 0, dev_major, dev_minor, inode);
-@@ -232,10 +280,12 @@
+@@ -220,10 +269,12 @@ static int one_proc(proc_t *p){
    if(!q_option){
      if(x_option){
        if(sizeof(KLONG)==8){


Index: procps.spec
===================================================================
RCS file: /cvs/extras/rpms/procps/devel/procps.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- procps.spec	5 Feb 2010 09:53:05 -0000	1.86
+++ procps.spec	8 Feb 2010 14:34:22 -0000	1.87
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -195,6 +195,9 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Feb 08 2010 Daniel Novotny <dnovotny at redhat.com> 3.2.8-7
+- fixed the last pmap(1) patch
+
 * Fri Feb 05 2010 Daniel Novotny <dnovotny at redhat.com> 3.2.8-6
 - fixed RSS values display of pmap(1)