From 62debaff1a107a2a8229f4a8a804762cec142071 Mon Sep 17 00:00:00 2001 From: Philip Knirsch Date: Wed, 25 Feb 2009 19:22:54 +0100 Subject: - Lots of whitespace changes - Bump release - Some minor README changes --- ChangeLog | 14 +++ INSTALL | 227 +-------------------------------------------- README | 25 ++++- contrib/diskdevstat | 4 +- contrib/netdevstat | 4 +- monitorplugins/__init__.py | 3 +- monitorplugins/disk.py | 3 +- monitorplugins/net.py | 2 +- tuned | 37 ++++---- tuned.py | 2 +- tuned.spec | 24 ++++- tuningplugins/__init__.py | 3 +- tuningplugins/disk.py | 2 +- tuningplugins/net.py | 2 +- 14 files changed, 90 insertions(+), 262 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24b8fd1..c04ce1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +commit 2f9173b101917db44503436f213988248447409e +Author: Philip Knirsch +Date: Wed Feb 25 18:23:15 2009 +0100 + + - Added a distarchive target for the Makefile for proper tagging in git + - Added a explanation how to create the tarball via git in the specfile + - Fixed the defattr() lines in the specfile to conform FRG + +commit fd0d01812c480c1a439041ba68265d04ec866bef +Author: Philip Knirsch +Date: Wed Feb 25 17:10:11 2009 +0100 + + - Added explanation for Source entry in specfile + commit efd15b9e707dc988265aa11ed14a82708cda71fa Author: Philip Knirsch Date: Wed Feb 25 15:08:41 2009 +0100 diff --git a/INSTALL b/INSTALL index d3c5b40..8e680db 100644 --- a/INSTALL +++ b/INSTALL @@ -1,237 +1,12 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - Basic Installation ================== -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and + 2. Type `make install' to install the programs and any data files and documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 6. Often, you can also type `make uninstall' to remove the installed - files again. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/README b/README index ca20a43..954d73c 100644 --- a/README +++ b/README @@ -1,5 +1,23 @@ -NAME - tuned - dynamic adaptive system tuning daemon +tuned: A simple daemon that performs monitoring and adaptive configuration + of devices in the system + +Copyright (C) 2008, 2009 Red Hat, Inc. +Authors: Phil Knirsch + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + SYNOPSIS tuned [options] @@ -19,6 +37,3 @@ BUGS AUTHOR Written by Phil Knirsch . - -REPORTING BUGS - Report bugs to . diff --git a/contrib/diskdevstat b/contrib/diskdevstat index a18d1b7..1c98fd5 100755 --- a/contrib/diskdevstat +++ b/contrib/diskdevstat @@ -9,12 +9,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the # diff --git a/contrib/netdevstat b/contrib/netdevstat index b2b4afc..491f376 100755 --- a/contrib/netdevstat +++ b/contrib/netdevstat @@ -9,12 +9,12 @@ # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to: # diff --git a/monitorplugins/__init__.py b/monitorplugins/__init__.py index de1aa0f..c728b11 100644 --- a/monitorplugins/__init__.py +++ b/monitorplugins/__init__.py @@ -13,5 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# This file intentionally left blank and needed because of python module magic. diff --git a/monitorplugins/disk.py b/monitorplugins/disk.py index a66f4b6..6167c84 100644 --- a/monitorplugins/disk.py +++ b/monitorplugins/disk.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # import os @@ -36,7 +36,6 @@ class DiskMonitor: self.devices[d]["max"] = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] print self.devices - def __calcdiff__(self, dev): l = [] for i in xrange(len(self.devices[dev]["old"])): diff --git a/monitorplugins/net.py b/monitorplugins/net.py index 114f1f0..bf806f7 100644 --- a/monitorplugins/net.py +++ b/monitorplugins/net.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # import os diff --git a/tuned b/tuned index 8452947..84e82d7 100755 --- a/tuned +++ b/tuned @@ -1,24 +1,25 @@ #!/usr/bin/python # -# tuned: A simple daemon that performs monitoring and adaptive configuration of devices in the system +# tuned: A simple daemon that performs monitoring and adaptive configuration +# of devices in the system +# +# Copyright (C) 2008, 2009 Red Hat, Inc. +# Authors: Phil Knirsch +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# Copyright (C) 2008, 2009 Red Hat, Inc. -# Authors: Phil Knirsch -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# import sys, os.path, getopt, atexit, signal diff --git a/tuned.py b/tuned.py index 2ec8256..773359a 100644 --- a/tuned.py +++ b/tuned.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # import time,os,locale,ConfigParser diff --git a/tuned.spec b/tuned.spec index 9f2bd1d..f1ab52b 100644 --- a/tuned.spec +++ b/tuned.spec @@ -1,6 +1,6 @@ Summary: A dynamic adaptive system tuning daemon Name: tuned -Version: 0.1.0 +Version: 0.1.1 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Daemons @@ -73,5 +73,27 @@ fi %changelog +* Wed Feb 25 2009 Phil Knirsch - 0.1.1-1 +- Added a changelog rule in Makefile +- Fixed rpmlint error messages +- Add init() methods to each plugin +- Call plugin init() methods during tuned's init() +- Add support for command line parameters + o -c conffile|--config==conffile to specify the location of the config file + o -d to start tuned as a daemon (instead of as normal app) +- Readded the debug output in case tuned isn't started as as daemon +- Fixed initialization of max transfer values for net tuning plugin +- Added complete cleanup code in case of tuned exiting and/or + getting a SIGTERM to restore default values +- Made the disk tuning pluging less nosy if started as non-daemon +- Fixed missing self. in the tuned.py config handling +- Added a manpage and updated the readme with it (as a start) +- Fixed summary +- Added missing GPL notic to tuned.py +- Added explanation for Source entry in specfile +- Added a distarchive target for the Makefile for proper tagging in git +- Added a explanation how to create the tarball via git in the specfile +- Fixed the defattr() lines in the specfile to conform FRG + * Mon Feb 23 2009 Phil Knirsch - 0.1.0-1 - Initial version diff --git a/tuningplugins/__init__.py b/tuningplugins/__init__.py index de1aa0f..2f95370 100644 --- a/tuningplugins/__init__.py +++ b/tuningplugins/__init__.py @@ -13,5 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # +# This file intentionally left blank and needed because of python module magic.$ diff --git a/tuningplugins/disk.py b/tuningplugins/disk.py index 3f0067e..d255252 100644 --- a/tuningplugins/disk.py +++ b/tuningplugins/disk.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # import os, copy diff --git a/tuningplugins/net.py b/tuningplugins/net.py index 4529253..1ef11c6 100644 --- a/tuningplugins/net.py +++ b/tuningplugins/net.py @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # import os, copy -- cgit