Hello community,
here is the log from the commit of package cpufrequtils for openSUSE:Factory
checked in at Thu Jan 14 22:17:06 CET 2010.
--------
--- cpufrequtils/cpufrequtils.changes 2009-06-19 11:00:11.000000000 +0200
+++ cpufrequtils/cpufrequtils.changes 2009-12-29 01:19:50.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Dec 29 00:37:12 CET 2009 - trenn@suse.de
+
+- Upgrade to version 006
+ New features
+ -> cpufreq-aperf shows the average frequency a core run for
+ a specific time. This also includes "boosted" frequencies
+ -> cpufreq-bench is a micobenchmark to test kernel cpufreq
+ governors and HW drivers. The cpufreq-bench is packaged
+ in a separate cpufrequtils-bench subpackage.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
cpufrequtils-005.tar.bz2
New:
----
cpufrequtils-006.tar.bz2
cpufrequtils_aperf_fix_proc_stat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpufrequtils.spec ++++++
--- /var/tmp/diff_new_pack.sQ3fTU/_old 2010-01-14 22:13:48.000000000 +0100
+++ /var/tmp/diff_new_pack.sQ3fTU/_new 2010-01-14 22:13:48.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package cpufrequtils (Version 005)
+# spec file for package cpufrequtils (Version 006)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,12 +21,13 @@
Name: cpufrequtils
BuildRequires: doxygen lynx
Url: http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html
-Version: 005
-Release: 2
+Version: 006
+Release: 1
Summary: Tools to Determine and Set CPUfreq Settings
-License: GPL v2 or later
+License: GPLv2+
Group: System/Base
Source: %{name}-%{version}.tar.bz2
+Patch0: cpufrequtils_aperf_fix_proc_stat.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bug437293
%ifarch ppc64
@@ -41,26 +42,45 @@
tools to determine current CPUfreq settings and to modify them
(cpufreq-info and cpufreq-set), and debug tools.
+Authors:
+--------
+ Dominik Brodowski
+%package bench
+License: GPLv2+
+Summary: CPU frequency micro benchmark
+Group: System/Benchmark
+
+%description bench
+cpufrequtils-bench helps to test the condition of a given kernel cpufreq
+governor (e.g. ondemand, userspace, conservative) and the cpufreq HW driver
+(e.g. powernow-k8, acpi-cpufreq, ...).
+For that purpose, it compares the performance governor to a configured
+powersave module.
Authors:
--------
- Dominik Brodowski
+ Christian Kornacker
%prep
%setup -q
+%patch0 -p1
%build
# This package failed when testing with -Wl,-as-needed being default.
# So we disable it here, if you want to retest, just delete this comment and the line below.
export SUSE_ASNEEDED=0
-CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir"
+CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true STRIP=true"
export CFLAGS="$RPM_OPT_FLAGS"
-make STRIP=true $CONF
+make $CONF
%install
-CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir"
+CONF="PACKAGE_BUGREPORT=http://bugs.opensuse.org mandir=%_mandir libdir=%_libdir CPUFRQ_BENCH=true DESTDIR=$RPM_BUILD_ROOT sbindir=/usr/sbin docdir=%{_docdir}/%{name} confdir=/etc"
make install DESTDIR=$RPM_BUILD_ROOT $CONF
+# copy to examples doc dir to avoid complains from the build
+# system about an executable in the doc dir.
+mkdir -p $RPM_BUILD_ROOT/%{_docdir}/%{name}/examples
+mv $RPM_BUILD_ROOT/%{_docdir}/%{name}/cpufreq-bench_script.sh $RPM_BUILD_ROOT/%{_docdir}/%{name}/examples
%find_lang %{name}
rm %{buildroot}%{_libdir}/*.*a
@@ -76,6 +96,20 @@
%{_libdir}/libcpufreq.*
%{_mandir}/man1/cpufreq*
/usr/include/cpufreq.h
-/usr/bin/cpufreq-*
+/usr/bin/cpufreq-info
+/usr/bin/cpufreq-set
+/usr/bin/cpufreq-aperf
+
+%files bench -f %{name}.lang
+%defattr (-,root,root)
+%config /etc/cpufreq-bench.conf
+/usr/sbin/cpufreq-bench
+/usr/bin/cpufreq-bench_plot.sh
+# Can't use %doc because I want to avoid cpufrequtils-bench doc dir
+# and use the cpufrequtils doc dir instead
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/examples
+%{_docdir}/%{name}/examples/cpufreq-bench_script.sh
+%{_docdir}/%{name}/README-BENCH
%changelog
++++++ cpufrequtils-005.tar.bz2 -> cpufrequtils-006.tar.bz2 ++++++
++++ 4422 lines of diff (skipped)
++++++ cpufrequtils_aperf_fix_proc_stat.patch ++++++
From 6657831200419d7509edcc04434d03b994c86adb Mon Sep 17 00:00:00 2001
From: Anton Arapov
Date: Wed, 11 Nov 2009 21:33:09 +0100
Subject: [PATCH] cpufreq/aperf : fix the /proc/stat read routine, always fails otherwise.
the statement:
if (!fgets(value, LINE_LEN, fp)) {
always fails(==0) at the end of proc file, so we will have err_out:
firing all the time.
I've aligned the code to the one that other utils of cpufreq has.
Signed-off-by: Anton Arapov
Signed-off-by: Dominik Brodowski
---
utils/aperf.c | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/utils/aperf.c b/utils/aperf.c
index a37f8b1..8ecff2c 100644
--- a/utils/aperf.c
+++ b/utils/aperf.c
@@ -76,14 +76,15 @@ static unsigned int count_cpus(void)
unsigned int cpunr = 0;
fp = fopen("/proc/stat", "r");
- if(!fp)
- goto err_out;
+ if(!fp) {
+ printf("Couldn't count the number of CPUs (%s: %s), "
+ "assuming 1\n", "/proc/stat", strerror(errno));
+ return 1;
+ }
while (!feof(fp)) {
- if (!fgets(value, LINE_LEN, fp)) {
- fclose(fp);
- goto err_out;
- }
+ if (!fgets(value, LINE_LEN, fp))
+ continue;
value[LINE_LEN - 1] = '\0';
if (strlen(value) < (LINE_LEN - 2))
continue;
@@ -98,11 +99,6 @@ static unsigned int count_cpus(void)
/* cpu count starts from 0, on error return 1 (UP) */
return (ret+1);
-
-err_out:
- printf("Couldn't count the number of CPUs (%s: %s), "
- "assuming 1\n", "/proc/stat", strerror(errno));
- return 1;
}
static int has_mperf_aperf_support(int cpu)
--
1.6.6
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org