rpms/sysstat/devel sysstat-9.0.6.1-tickless.patch, 1.1, 1.2 sysstat.spec, 1.78, 1.79
Ivana Varekova
varekova at fedoraproject.org
Mon Apr 19 09:12:40 UTC 2010
- Previous message: rpms/kernel/F-13 drm-radeon-firemv-pciid.patch, NONE, 1.1 drm-radeon-fix-rs600-tlb.patch, NONE, 1.1 drm-radeon-kms-fix-dual-link-dvi.patch, NONE, 1.1 kernel.spec, 1.1988, 1.1989
- Next message: rpms/xorg-x11-drv-ati/F-13 radeon-6.13-fixes.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.197, 1.198
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: varekova
Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14674
Modified Files:
sysstat-9.0.6.1-tickless.patch sysstat.spec
Log Message:
- fix mpstat tool (when the cpu is switched off)
sysstat-9.0.6.1-tickless.patch:
mpstat.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
Index: sysstat-9.0.6.1-tickless.patch
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat-9.0.6.1-tickless.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sysstat-9.0.6.1-tickless.patch 16 Apr 2010 12:42:38 -0000 1.1
+++ sysstat-9.0.6.1-tickless.patch 19 Apr 2010 09:12:40 -0000 1.2
@@ -1,16 +1,42 @@
-diff -up sysstat-9.0.6.1/mpstat.c.pom sysstat-9.0.6.1/mpstat.c
---- sysstat-9.0.6.1/mpstat.c.pom 2009-09-12 20:59:04.000000000 +0200
-+++ sysstat-9.0.6.1/mpstat.c 2010-04-16 14:32:06.000000000 +0200
-@@ -273,9 +273,10 @@ void write_stats_core(int prev, int curr
+diff -up sysstat-9.0.6.1/mpstat.c.tl sysstat-9.0.6.1/mpstat.c
+--- sysstat-9.0.6.1/mpstat.c.tl 2009-09-12 20:59:04.000000000 +0200
++++ sysstat-9.0.6.1/mpstat.c 2010-04-19 10:42:01.000000000 +0200
+@@ -272,10 +272,21 @@ void write_stats_core(int prev, int curr
+ /* Recalculate itv for current proc */
pc_itv = get_per_cpu_interval(scc, scp);
- if (!pc_itv) {
+- if (!pc_itv) {
- /* Current CPU is offline */
-+ /* Current CPU is tickless
-+ if the CPU is offline it is omited from /proc/stat */
++ /* if the CPU is offline it is omited from /proc/stat
++ so the sum of all values is zero */
++ if ((scc->cpu_user + scc->cpu_nice + scc->cpu_sys +
++ scc->cpu_iowait + scc->cpu_idle + scc->cpu_steal +
++ scc->cpu_hardirq + scc->cpu_softirq) == 0) {
printf(" 0.00 0.00 0.00 0.00 0.00 0.00"
-- " 0.00 0.00 0.00\n");
-+ " 0.00 0.00 100.00\n");
+ " 0.00 0.00 0.00\n");
++ continue;
++ }
++
++ /* if the CPU is tickless then
++ there is no change in CPU values but the sum of values is not null */
++ if (!pc_itv) {
++ printf(" 0.00 0.00 0.00 0.00 0.00 0.00"
++ " 0.00 0.00 100.00\n");
}
else {
printf(" %6.2f %6.2f %6.2f %6.2f %6.2f %6.2f"
+@@ -643,6 +654,14 @@ void rw_mpstat_loop(int dis_hdr, int row
+ scc = st_cpu[curr] + cpu;
+ scp = st_cpu[!curr] + cpu;
+ *scc = *scp;
++ scc->cpu_user = 0;
++ scc->cpu_nice = 0;
++ scc->cpu_sys = 0;
++ scc->cpu_iowait = 0;
++ scc->cpu_idle = 0;
++ scc->cpu_steal = 0;
++ scc->cpu_hardirq = 0;
++ scc->cpu_softirq = 0;
+ }
+
+ /* Get time */
Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sysstat.spec 16 Apr 2010 12:42:38 -0000 1.78
+++ sysstat.spec 19 Apr 2010 09:12:40 -0000 1.79
@@ -1,6 +1,6 @@
Name: sysstat
Version: 9.0.6.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The sar and iostat system monitoring commands
License: GPLv2+
Group: Applications/System
@@ -83,6 +83,9 @@ rm -rf %{buildroot}
%{_localstatedir}/log/sa
%changelog
+* Mon Apr 19 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 9.0.6.1-3
+- fix mpstat tool (when the cpu is switched off)
+
* Fri Apr 16 2010 Ivana Hutarova Varekova <varekova at redhat.com> - 9.0.6.1-2
- fix the mpstat output on tickless kernel
- Previous message: rpms/kernel/F-13 drm-radeon-firemv-pciid.patch, NONE, 1.1 drm-radeon-fix-rs600-tlb.patch, NONE, 1.1 drm-radeon-kms-fix-dual-link-dvi.patch, NONE, 1.1 kernel.spec, 1.1988, 1.1989
- Next message: rpms/xorg-x11-drv-ati/F-13 radeon-6.13-fixes.patch, NONE, 1.1 xorg-x11-drv-ati.spec, 1.197, 1.198
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list