rpms/cpuspeed/devel cpuspeed.8, NONE, 1.1 cpuspeed.init, 1.23, 1.24 cpuspeed.spec, 1.48, 1.49

[fedora-cvs-commits redhat com]

Author: jwilson

Update of /cvs/dist/rpms/cpuspeed/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7148

Modified Files:
	cpuspeed.init cpuspeed.spec 
Added Files:
	cpuspeed.8 
Log Message:
- Move config file to /etc/sysconfig/cpuspeed, more
  appropriate for initscript configs (#152305)
- Manify 'cpuspeed --help' along with other details (#172655)
- Tweak cpuspeed default thresholds (#147565)



--- NEW FILE cpuspeed.8 ---
.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
.TH CPUSPEED "8" "January 09, 2005" "cpuspeed v1.2.1" "Program Options"
.SH NAME
cpuspeed \- user-space cpu frequency scaling program, v1.2.1
.SH SYNOPSIS
.B cpuspeed
[\fIOptions\fR]
.SH DESCRIPTION
cpuspeed v1.2.1
.PP
This program monitors the system's idle percentage and reduces or raises the
CPUs' clock speeds and voltages accordingly to minimize power consumption
when idle and maximize performance when needed.  This is the default.
.PP
The program may also optionally be configured to reduce the CPUs' clock
speeds if the temperature gets too high, NOT minimize their speeds if the
computer's AC adapter is disconnected or maximize their speeds when the AC
adapter is connected.
.PP
By default this program will manage every CPU found in the system.
.IP
Options:
.HP
\fB\-d\fR
.IP
Tells the process to daemonize itself (run in background).
.HP
\fB\-i\fR <interval>
.IP
Sets the interval between idle percentage tests and possible speed
changes in tenths of a second (default is 20).
.HP
\fB\-p\fR <fast up> <threshold>
.TP
Sets the CPU idle percentage thresholds.
<fast up> is the idle
.IP
percentage below which a CPU will be set to the highest possible
speed.  <threshold> is the idle percentage above which a CPU's
speed will be decreased and below which a CPU's speed will be
increased (defaults are 10 and 25).
.HP
\fB\-m\fR <minimum speed>
.IP
Sets the minimum speed in KHz below which a CPU will not be set.
.HP
\fB\-M\fR <maximum speed>
.IP
Sets the maximum speed in KHz above which a CPU will not be set.
.HP
\fB\-t\fR <temp file> <maxtemp>
.IP
Sets the ACPI temperature file and the temperature at which CPUs
will be set to minimum speed.
.HP
\fB\-T\fR <interval>
.IP
Sets the interval at which the temperature will be polled in
tenths  of a second (default is 10).
(Requires the '\-t' option above.)
.HP
\fB\-a\fR <AC file>
.IP
Sets the ACPI AC adapter state file and tells the program to set
the CPUs to minimum speed when the AC adapter is disconnected.
(This is the default but is changeable by the '\-D' option below).
.HP
\fB\-A\fR <interval>
.IP
Sets the interval at which the AC adapter state will be polled in
tenths  of a second (default is 50).
(Requires the '\-a' option above.)
.HP
\fB\-C\fR
.IP
Run at maximum speed when AC adapter is connected.
(Requires the '\-a' option above.)
.HP
\fB\-D\fR
.IP
Do NOT force minimum speed when AC adapter is disconnected.
(Requires the '\-a' option above.)
.HP
\fB\-r\fR
.IP
Restores previous speed on program exit.
.HP
\fB\-s\fR <CPU>
.TP
Manage only a single CPU.
<CPU> specifies the number of the CPU
.IP
to manage and is in the range 0 to (n\-1) where 'n' is the number
of CPUs in the system.  Without this option the program creates
copies of itself to manage every CPU in the system.
.IP
To have a CPU stay at the highest clock speed to maximize performance send
the process controlling that CPU the SIGUSR1 signal.
.IP
To have a CPU stay at the lowest clock speed to maximize battery life send
the process controlling that CPU the SIGUSR2 signal.
.IP
To resume having a CPU's clock speed dynamically scaled send the process
controlling that CPU the SIGHUP signal.
.SS "Notes:"
Many modern Linux systems support in-kernel cpu frequency scaling. The
cpuspeed daemon only works in conjunction with the 'userspace' frequency
scaling governor. Other governors, such as 'ondemand' and 'conservative',
rely on the Linux kernel to adjust cpu frequencies on the fly without the
need of any user-space assistance, such as that provided by cpuspeed.
.PP
Red Hat and Fedora distributions employ a unified configuration file
for both scenarios, as well as a cpuspeed init script that will configure
either cpuspeed or in-kernel cpu frequency scaling, as appropriate.
.SH "FILES"
.na
.nf
/etc/sysconfig/cpuspeed, configuration file
/etc/init.d/cpuspeed, initialzation script
/usr/sbin/cpuspeed, cpuspeed program
.SH "SEE ALSO"
.PP
The CPUSpeed web page:
  \fB http://carlthompson.net/Software/CPUSpeed\fR
.SH "LICENSE"
.PP
CPUSpeed is released under the GNU General Public License version 2 (or if
you wish any later version). This license allows you to use, copy,
distribute and modify the software with very few restrictions. The full
text of the license may be found here:
  \fBhttp://carlthompson.net/Software/CPUSpeed/License\fR
.SH "AUTHOR(S):"
.TP
CPUSpeed daemon, original init script and configuration file:
.na
.nf
Carl Thompson \- cet [at] carlthompson.net
    (copyright 2002 \- 2005)
.TP
Modernized init script, configuration file and man page:
.na
.nf
Dave Jones \- davej [at] redhat.com
Michal Jaegermann \- michal [at] harddata.com
Jarod Wilson \- jwilson [at] redhat.com


Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cpuspeed.init	8 Jan 2007 15:40:06 -0000	1.23
+++ cpuspeed.init	9 Jan 2007 15:51:31 -0000	1.24
@@ -13,8 +13,8 @@
 prog="cpuspeed"
 
 # Get config.
-if [ -f /etc/cpuspeed.conf ]; then
-        . /etc/cpuspeed.conf
+if [ -f /etc/sysconfig/cpuspeed ]; then
+        . /etc/sysconfig/cpuspeed
 fi
 
 cpu0freqd=/sys/devices/system/cpu/cpu0/cpufreq
@@ -68,16 +68,16 @@
 	# math here for use of unified config...
 	# DOWN_THRESHOLD doesn't mean exactly the same thing for
 	# cpuspeed as it does for the cpufreq governors, but close
-	# enough, and if not specified, we use the daemon defaults.
+	# enough, and if not specified, we use same defaults as governors.
 	if [ -n "$UP_THRESHOLD" ]; then
 	    let UP_THRESHOLD=100-$UP_THRESHOLD
 	else
-	    UP_THRESHOLD=10
+	    UP_THRESHOLD=20
 	fi
 	if [ -n "$DOWN_THRESHOLD" ]; then
 	    let DOWN_THRESHOLD=100-$DOWN_THRESHOLD
 	else
-	    DOWN_THRESHOLD=25
+	    DOWN_THRESHOLD=80
 	fi
 	OPTS="$OPTS -p $UP_THRESHOLD $DOWN_THRESHOLD"
 	if [ -n "$MIN_SPEED" ]; then


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- cpuspeed.spec	8 Jan 2007 15:49:49 -0000	1.48
+++ cpuspeed.spec	9 Jan 2007 15:51:31 -0000	1.49
@@ -10,6 +10,7 @@
 Source1:        cpuspeed.init
 Source2:        http://carlthompson.net/dl/cpuspeed/license.txt
 Source3:        cpuspeed.conf
+Source4:        cpuspeed.8
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post):  /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -44,13 +45,15 @@
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
+mkdir -p %{buildroot}%{_mandir}/man8/
 
 make CFLAGS="$RPM_OPT_FLAGS -fpie -pie -Wl,-z,relro,-z,now"
 
 %install
 install cpuspeed %{buildroot}%{_sbindir}
 install %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/cpuspeed
-install %{SOURCE3} %{buildroot}%{_sysconfdir}
+install %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/cpuspeed
+install %{SOURCE4} %{buildroot}%{_mandir}/man8/cpuspeed.8
 
 chmod -R a-s %{buildroot}
 
@@ -62,7 +65,8 @@
 %doc license.txt CHANGES EXAMPLES FEATURES README USAGE
 %{_sbindir}/cpuspeed
 %{_sysconfdir}/rc.d/init.d/cpuspeed
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/cpuspeed.conf
+%{_mandir}/man8/*
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/sysconfig/cpuspeed
 
 %preun
 if [ "$1" = "0" ] ; then
@@ -78,6 +82,12 @@
 exit 0
 
 %changelog
+* Tue Jan 09 2007 Jarod Wilson <jwilson redhat com>
+- Move config file to /etc/sysconfig/cpuspeed, more
+  appropriate for initscript configs (#152305)
+- Manify 'cpuspeed --help' along with other details (#172655)
+- Tweak cpuspeed default thresholds (#147565)
+
 * Mon Jan 08 2007 Jarod Wilson <jwilson redhat com>
 - Let non-centrino/powernow-k8 systems also use other
   validated governors (#219926)
@@ -87,7 +97,7 @@
 - Fix status and condrestart for centrino/powernow-k8 (#219926)
 - Give feedback when loading/unloading a cpufreq governor
 - Rework config file and initscript to make it much easier
-  for end-users to adjust frequency scaling setup
+  for end-users to adjust frequency scaling setup (#151761)
 - Log start/stop events with useful info
 - Don't start on xen kernels (freq scaling not supported)