rpms/procps/devel procps-3.2.5-top-remcpu.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 procps-3.2.3-FAQ.patch, 1.1, 1.2 procps.spec, 1.40, 1.41 sources, 1.11, 1.12 procps-3.2.5-top-sigwinch.patch, 1.1, NONE procps-3.2.5-vmstat-parg.patch, 1.1, NONE procps-3.2.5.remcpu.patch, 1.2, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Nov 1 10:37:42 UTC 2005
- Previous message (by thread): rpms/jonas/devel jonas.spec,1.123,1.124
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, NONE, 1.1 .cvsignore, 1.83, 1.84 openoffice.org.spec, 1.519, 1.520 sources, 1.123, 1.124 workspace.emblock1.patch, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kzak
Update of /cvs/dist/rpms/procps/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27846
Modified Files:
.cvsignore procps-3.2.3-FAQ.patch procps.spec sources
Added Files:
procps-3.2.5-top-remcpu.patch
Removed Files:
procps-3.2.5-top-sigwinch.patch procps-3.2.5-vmstat-parg.patch
procps-3.2.5.remcpu.patch
Log Message:
update to new upstream version
procps-3.2.5-top-remcpu.patch:
top.c | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
--- NEW FILE procps-3.2.5-top-remcpu.patch ---
--- procps-3.2.5/top.c.remcpu 2005-10-12 14:11:22.000000000 +0200
+++ procps-3.2.5/top.c 2005-10-12 14:49:59.000000000 +0200
@@ -910,6 +910,7 @@
static CPU_t *cpus_refresh (CPU_t *cpus)
{
static FILE *fp = NULL;
+ static int cpu_max;
int i;
int num;
// enough for a /proc/stat CPU line (not the intr line)
@@ -924,34 +925,33 @@
can hold tics representing the /proc/stat cpu summary (the first
line read) -- that slot supports our View_CPUSUM toggle */
cpus = alloc_c((1 + Cpu_tot) * sizeof(CPU_t));
+ cpu_max = Cpu_tot;
}
+ else if (cpu_max > Cpu_tot)
+ /* move saved CUPs summary to cpu_max possition */
+ memcpy(&cpus[cpu_max], &cpus[Cpu_tot], sizeof(CPU_t));
+
rewind(fp);
fflush(fp);
// first value the last slot with the cpu summary line
if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
- cpus[Cpu_tot].x = 0; // FIXME: can't tell by kernel version number
- cpus[Cpu_tot].y = 0; // FIXME: can't tell by kernel version number
+ cpus[cpu_max].x = 0; // FIXME: can't tell by kernel version number
+ cpus[cpu_max].y = 0; // FIXME: can't tell by kernel version number
num = sscanf(buf, "cpu %Lu %Lu %Lu %Lu %Lu %Lu %Lu",
- &cpus[Cpu_tot].u,
- &cpus[Cpu_tot].n,
- &cpus[Cpu_tot].s,
- &cpus[Cpu_tot].i,
- &cpus[Cpu_tot].w,
- &cpus[Cpu_tot].x,
- &cpus[Cpu_tot].y
+ &cpus[cpu_max].u,
+ &cpus[cpu_max].n,
+ &cpus[cpu_max].s,
+ &cpus[cpu_max].i,
+ &cpus[cpu_max].w,
+ &cpus[cpu_max].x,
+ &cpus[cpu_max].y
);
if (num < 4)
std_err("failed /proc/stat read");
- // and just in case we're 2.2.xx compiled without SMP support...
- if (Cpu_tot == 1) {
- cpus[1].id = 0;
- memcpy(cpus, &cpus[1], sizeof(CPU_t));
- }
-
// now value each separate cpu's tics
- for (i = 0; 1 < Cpu_tot && i < Cpu_tot; i++) {
+ for (i = 0; ; i++) {
if (!fgets(buf, sizeof(buf), fp)) std_err("failed /proc/stat read");
cpus[i].x = 0; // FIXME: can't tell by kernel version number
cpus[i].y = 0; // FIXME: can't tell by kernel version number
@@ -959,9 +959,28 @@
&cpus[i].id,
&cpus[i].u, &cpus[i].n, &cpus[i].s, &cpus[i].i, &cpus[i].w, &cpus[i].x, &cpus[i].y
);
- if (num < 4)
- std_err("failed /proc/stat read");
+ if (num < 4) {
+ Cpu_tot = i;
+ break;
+ }
+ if (i == cpu_max - 1) {
+ // Bump cpu_max and extend cpus
+ cpu_max++;
+ cpus = realloc(cpus, (1 + cpu_max) * sizeof(CPU_t));
+ if (!cpus) std_err("realloc failed");
+ memcpy(&cpus[cpu_max], &cpus[cpu_max-1], sizeof(CPU_t));
+ }
}
+
+ if (cpu_max > Cpu_tot)
+ memcpy(&cpus[Cpu_tot], &cpus[cpu_max], sizeof(CPU_t));
+
+ // and just in case we're 2.2.xx compiled without SMP support...
+ if (Cpu_tot == 1) {
+ cpus[1].id = 0;
+ memcpy(cpus, &cpus[1], sizeof(CPU_t));
+ }
+
return cpus;
}
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 1 Feb 2005 16:18:50 -0000 1.11
+++ .cvsignore 1 Nov 2005 10:37:33 -0000 1.12
@@ -1 +1 @@
-procps-3.2.5.tar.gz
+procps-3.2.6.tar.gz
procps-3.2.3-FAQ.patch:
proc/library.map | 2 +-
proc/version.c | 4 +++-
proc/version.h | 1 +
ps/parser.c | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
Index: procps-3.2.3-FAQ.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps-3.2.3-FAQ.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.3-FAQ.patch 9 Sep 2004 10:56:45 -0000 1.1
+++ procps-3.2.3-FAQ.patch 1 Nov 2005 10:37:33 -0000 1.2
@@ -1,16 +1,15 @@
---- procps-3.2.3/ps/parser.c.FAQ 2004-08-10 10:19:14.763608282 -0400
-+++ procps-3.2.3/ps/parser.c 2004-08-10 10:19:14.820602565 -0400
-@@ -1218,7 +1218,7 @@
- // as SysV options... and you're screwed if you've been patching
- // out the friendly warning. Cut-over is likely to be in 2005.
- if(!(personality & PER_FORCE_BSD))
-- fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
-+ fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See /usr/share/doc/procps-%s/FAQ\n",procps_number_version);
- // Remember: contact albert at users.sf.net or procps-feedback at lists.sf.net
- // if you should feel tempted. Be damn sure you understand all
- // the issues. The same goes for other stuff too, BTW. Please ask.
---- procps-3.2.3/proc/version.c.FAQ 2003-01-28 20:11:43.000000000 -0500
-+++ procps-3.2.3/proc/version.c 2004-08-10 10:19:14.821602465 -0400
+--- procps-3.2.6/proc/version.h.FAQ 2002-12-15 01:08:32.000000000 +0100
++++ procps-3.2.6/proc/version.h 2005-10-31 20:29:18.000000000 +0100
+@@ -16,6 +16,7 @@
+
+ extern void display_version(void); /* display suite version */
+ extern const char procps_version[]; /* global buf for suite version */
++extern const char procps_number_version[]; /* global buf for suite number version */
+
+ extern int linux_version_code; /* runtime version of LINUX_VERSION_CODE
+ in /usr/include/linux/version.h */
+--- procps-3.2.6/proc/version.c.FAQ 2003-01-29 02:11:43.000000000 +0100
++++ procps-3.2.6/proc/version.c 2005-10-31 20:29:18.000000000 +0100
@@ -16,8 +16,10 @@
#ifdef MINORVERSION
@@ -23,24 +22,25 @@
#endif
void display_version(void) {
---- procps-3.2.3/proc/library.map.FAQ 2004-07-21 14:27:55.000000000 -0400
-+++ procps-3.2.3/proc/library.map 2004-08-10 10:21:38.796568918 -0400
+--- procps-3.2.6/proc/library.map.FAQ 2005-03-14 05:32:40.000000000 +0100
++++ procps-3.2.6/proc/library.map 2005-10-31 20:32:39.000000000 +0100
@@ -9,7 +9,7 @@
escape_str; escape_strlist;
openproc; closeproc;
tty_to_dev; dev_to_tty; open_psdb_message; open_psdb; lookup_wchan;
- display_version; procps_version; linux_version_code;
+ display_version; procps_version; procps_number_version; linux_version_code;
- Hertz; smp_num_cpus;
+ Hertz; smp_num_cpus; have_privs;
sprint_uptime; uptime; user_from_uid; print_uptime; loadavg;
pretty_print_signals; print_given_signals; unix_print_signals; signal_name_to_number; signal_number_to_name;
---- procps-3.2.3/proc/version.h.FAQ 2002-12-14 19:08:32.000000000 -0500
-+++ procps-3.2.3/proc/version.h 2004-08-10 10:19:14.834601161 -0400
-@@ -16,6 +16,7 @@
-
- extern void display_version(void); /* display suite version */
- extern const char procps_version[]; /* global buf for suite version */
-+extern const char procps_number_version[]; /* global buf for suite number version */
-
- extern int linux_version_code; /* runtime version of LINUX_VERSION_CODE
- in /usr/include/linux/version.h */
+--- procps-3.2.6/ps/parser.c.FAQ 2005-10-31 20:29:18.000000000 +0100
++++ procps-3.2.6/ps/parser.c 2005-10-31 20:29:18.000000000 +0100
+@@ -1238,7 +1238,7 @@
+ // as SysV options... and you're screwed if you've been patching
+ // out the friendly warning. Cut-over is likely to be in 2005.
+ if(!(personality & PER_FORCE_BSD))
+- fprintf(stderr, "Warning: bad ps syntax, perhaps a bogus '-'? See http://procps.sf.net/faq.html\n");
++ fprintf(stderr, "Warning: bad syntax, perhaps a bogus '-'? See /usr/share/doc/procps-%s/FAQ\n",procps_number_version);
+ // Remember: contact albert at users.sf.net or procps-feedback at lists.sf.net
+ // if you should feel tempted. Be damn sure you understand all
+ // the issues. The same goes for other stuff too, BTW. Please ask.
Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/procps.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- procps.spec 12 Oct 2005 12:50:29 -0000 1.40
+++ procps.spec 1 Nov 2005 10:37:33 -0000 1.41
@@ -1,7 +1,7 @@
Summary: System and process monitoring utilities.
Name: procps
-Version: 3.2.5
-Release: 8
+Version: 3.2.6
+Release: 1
License: GPL
Group: Applications/System
Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -20,12 +20,8 @@
Patch9: procps-3.2.5-sysctl-writeonly.patch
# 161449 - "top" ignores user and system toprc
Patch10: procps-3.2.5-top-rc.patch
-# 161559 - top segfaults when resizing konsole
-Patch11: procps-3.2.5-top-sigwinch.patch
-# 160796 - vmstat crashes when accessing LVM partition.
-Patch12: procps-3.2.5-vmstat-parg.patch
# 161303 - 'top' failed when remove cpus
-Patch13: procps-3.2.5.remcpu.patch
+Patch11: procps-3.2.5-top-remcpu.patch
BuildRequires: ncurses-devel
@@ -63,9 +59,7 @@
%patch8 -p1 -b .0x9b
%patch9 -p1 -b .writeonly
%patch10 -p1 -b .rc
-%patch11 -p1 -b .sigwinch
-%patch12 -p1 -b .parg
-%patch13 -p1 -b .remcpu
+%patch11 -p1 -b .remcpu
cp %SOURCE1 .
@@ -103,6 +97,9 @@
%attr(0644,root,root) %{_mandir}/man5/*
%changelog
+* Mon Oct 31 2005 Karel Zak <kzak at redhat.com> 3.2.6-1
+- update to new upstream release
+
* Wed Oct 12 2005 Karel Zak <kzak at redhat.com> 3.2.5-8
- fix #170083 - Top showing bad cpu usage numbers
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/procps/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 1 Feb 2005 16:18:50 -0000 1.11
+++ sources 1 Nov 2005 10:37:33 -0000 1.12
@@ -1 +1 @@
-cde0e3612d1d7c68f404d46f01c44fb4 procps-3.2.5.tar.gz
+7ce39ea27d7b3da0e8ad74dd41d06783 procps-3.2.6.tar.gz
--- procps-3.2.5-top-sigwinch.patch DELETED ---
--- procps-3.2.5-vmstat-parg.patch DELETED ---
--- procps-3.2.5.remcpu.patch DELETED ---
- Previous message (by thread): rpms/jonas/devel jonas.spec,1.123,1.124
- Next message (by thread): rpms/openoffice.org/devel openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, NONE, 1.1 .cvsignore, 1.83, 1.84 openoffice.org.spec, 1.519, 1.520 sources, 1.123, 1.124 workspace.emblock1.patch, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list