Hello community,
here is the log from the commit of package procps for openSUSE:Factory checked
in at 2013-10-07 15:58:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 2013-10-01
08:25:22.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2013-10-07
15:58:02.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Oct 7 13:35:36 UTC 2013 - wer...@suse.de
+
+- Be aware of new VmFlags entry in /proc/<pid>/smaps
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ procps.spec ++++++
--- /var/tmp/diff_new_pack.EXLfAX/_old 2013-10-07 15:58:03.000000000 +0200
+++ /var/tmp/diff_new_pack.EXLfAX/_new 2013-10-07 15:58:03.000000000 +0200
@@ -196,7 +196,14 @@
--with-gnu-ld
make %{?_smp_mflags}
-./pmap $$
+./pmap $$ || {
+ uname -a
+ echo /proc/$$/maps
+ cat /proc/$$/maps
+ echo /proc/$$/smaps
+ cat /proc/$$/smaps
+ exit 1
+}
%install
make DESTDIR=%{buildroot} install
++++++ 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 2013-09-30 15:03:43.000000000 +0200
+++ new/procps-pmap-legacy/pmap.c 2013-10-07 15:35:23.000000000 +0200
@@ -51,6 +51,7 @@
{ "KernelPageSize", 0, 0, 0},
{ "MMUPageSize", 0, 0, 0},
{ "Locked", 0, 0, 0},
+ { "VmFlags", 0, 0, 0},
{ 0 }
};
static const size_t SmapLines = sizeof(smap)/sizeof(struct smap)-1;
@@ -70,8 +71,9 @@
KernelPageSize,
MMUPageSize,
Locked,
+ VmFlags,
};
-static const size_t LastType = (size_t)(Locked+1);
+static const size_t LastType = (size_t)(VmFlags+1);
static unsigned long long range_low;
static unsigned long long range_high = ~0ULL;
@@ -102,7 +104,7 @@
static int get_smap_data(struct smap *smap)
{
unsigned long long data;
- int assigned;
+ int assigned, count;
char *buff = &lastmap[0];
struct smap* ptr;
@@ -120,6 +122,7 @@
if (assigned != 1)
return 1;
+ count = 0;
ptr = smap;
while (ptr->name) {
char *colon;
@@ -141,6 +144,7 @@
next:
if (strcmp(ptr->name, buff) != 0) {
if ((ptr+1)->name) {
+ count++;
ptr++;
goto next;
}
@@ -157,10 +161,11 @@
if (assigned == 1) {
ptr->data = data;
ptr->total += data;
- } else
+ } else if (count != VmFlags)
return 1;
*lastmap = '\0';
+ count++;
ptr++;
}
@@ -358,7 +363,7 @@
}
if (!get_proc_stats(pid, &proc)) {
- fprintf(stderr, "failed to parse /proc/%d/smaps\n",
pid);
+ fprintf(stderr, "failed to parse /proc/%d\n", pid);
exit(EXIT_FAILURE);
}
printf("%d: %s\n", pid, proc.cmd);
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 1970-01-01 01:00:00.000000000 +0100
+++ new/procps-pmap-legacy/test 2013-10-07 14:46:33.000000000 +0200
@@ -0,0 +1,272 @@
+10000000-100d0000 r-xp 00000000 fd:00 1228802
/bin/bash
+Size: 832 kB
+Rss: 768 kB
+Pss: 768 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 768 kB
+Private_Dirty: 0 kB
+Referenced: 768 kB
+Anonymous: 0 kB
+AnonHugePages: 0 kB
+Swap: 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
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 128 kB
+Referenced: 128 kB
+Anonymous: 128 kB
+AnonHugePages: 0 kB
+Swap: 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]
+Size: 192 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
+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
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 128 kB
+Referenced: 128 kB
+Anonymous: 128 kB
+AnonHugePages: 0 kB
+Swap: 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
+Shared_Dirty: 0 kB
+Private_Clean: 64 kB
+Private_Dirty: 0 kB
+Referenced: 1408 kB
+Anonymous: 0 kB
+AnonHugePages: 0 kB
+Swap: 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
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 128 kB
+Referenced: 128 kB
+Anonymous: 128 kB
+AnonHugePages: 0 kB
+Swap: 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
+Size: 64 kB
+Rss: 64 kB
+Pss: 16 kB
+Shared_Clean: 64 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 0 kB
+Referenced: 64 kB
+Anonymous: 0 kB
+AnonHugePages: 0 kB
+Swap: 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
+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
+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
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 128 kB
+Private_Dirty: 0 kB
+Referenced: 128 kB
+Anonymous: 0 kB
+AnonHugePages: 0 kB
+Swap: 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
+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
+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
+Size: 384 kB
+Rss: 192 kB
+Pss: 192 kB
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 192 kB
+Private_Dirty: 0 kB
+Referenced: 192 kB
+Anonymous: 0 kB
+AnonHugePages: 0 kB
+Swap: 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
+Shared_Clean: 0 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 128 kB
+Referenced: 128 kB
+Anonymous: 128 kB
+AnonHugePages: 0 kB
+Swap: 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
+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
+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]
+Size: 128 kB
+Rss: 128 kB
+Pss: 19 kB
+Shared_Clean: 128 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 0 kB
+Referenced: 128 kB
+Anonymous: 0 kB
+AnonHugePages: 0 kB
+Swap: 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
+Size: 192 kB
+Rss: 192 kB
+Pss: 31 kB
+Shared_Clean: 192 kB
+Shared_Dirty: 0 kB
+Private_Clean: 0 kB
+Private_Dirty: 0 kB
+Referenced: 192 kB
+Anonymous: 0 kB
+AnonHugePages: 0 kB
+Swap: 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
+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
+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]
+Size: 256 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
+KernelPageSize: 64 kB
+MMUPageSize: 64 kB
+Locked: 0 kB
+VmFlags: rd wr mr mw me gd ac
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
