diff options
author | Philip Knirsch <pknirsch@hamburg.stuttgart.redhat.com> | 2009-02-20 18:29:35 +0100 |
---|---|---|
committer | Philip Knirsch <pknirsch@hamburg.stuttgart.redhat.com> | 2009-02-20 18:29:35 +0100 |
commit | c02f25afb09ff1f38484a8b69c4dcc85ed2378c7 (patch) | |
tree | f0c8a9d0a4552f07bac2272fca8a70cf736d453d | |
parent | 5818e327421ff22f41618c7b9fa74be8d23d4fd5 (diff) | |
download | tuned-c02f25afb09ff1f38484a8b69c4dcc85ed2378c7.tar.gz tuned-c02f25afb09ff1f38484a8b69c4dcc85ed2378c7.tar.xz tuned-c02f25afb09ff1f38484a8b69c4dcc85ed2378c7.zip |
- Lots of updates to packaging and installation (specfile, makefile)
-rw-r--r-- | AUTHORS | 1 | ||||
-rw-r--r-- | ChangeLog | 0 | ||||
-rw-r--r-- | INSTALL | 237 | ||||
-rw-r--r-- | Makefile | 52 | ||||
-rw-r--r-- | NEWS | 1 | ||||
-rw-r--r-- | README | 0 | ||||
-rwxr-xr-x | contrib/diskdevstat.stp | 1 | ||||
-rwxr-xr-x | contrib/netdevstat.stp | 1 | ||||
-rw-r--r-- | doc/README.txt (renamed from README.txt) | 0 | ||||
-rw-r--r-- | tuned.spec | 48 | ||||
-rw-r--r-- | tuningplugins/disk.py | 11 | ||||
-rw-r--r-- | tuningplugins/net.py | 15 |
12 files changed, 355 insertions, 12 deletions
@@ -0,0 +1 @@ +Phil Knirsch <pknirsch@redhat.com> diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/ChangeLog @@ -0,0 +1,237 @@ +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 + 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/Makefile b/Makefile new file mode 100644 index 0000000..f17879e --- /dev/null +++ b/Makefile @@ -0,0 +1,52 @@ +NAME=tuned +VERSION=$(shell awk '/^Version:/ {print $$2}' tuned.spec) +RELEASE=$(shell awk '/^Release:/ {print $$2}' tuned.spec) +VERSIONED_NAME=$(NAME)-$(VERSION) + +DESTDIR=/ +MANDIR=/usr/share/man/ +GITTAG = r$(subst .,-,$(VERSION)) + +DIRS = doc contrib tuningplugins monitorplugins +FILES = tuned +DOCS = AUTHORS ChangeLog COPYING INSTALL NEWS README tuned.spec + +archive: + rm -rf $(VERSIONED_NAME) + mkdir -p $(VERSIONED_NAME) + cp $(FILES) $(VERSIONED_NAME)/ + cp $(DOCS) $(VERSIONED_NAME)/ + + tar cjf $(VERSIONED_NAME).tar.bz2 $(VERSIONED_NAME) + ln -fs $(VERSIONED_NAME).tar.bz2 latest-archive + +tag: + git tag $(GITTAG) + +srpm: archive + rm -rf rpm-build-dir + mkdir rpm-build-dir + rpmbuild --define "_sourcedir `pwd`/rpm-build-dir" --define "_srcrpmdir `pwd`/rpm-build-dir" \ + --define "_specdir `pwd`/rpm-build-dir" --nodeps -ts $(VERSIONED_NAME).tar.bz2 + rm -rf rpm-build-dir + +build: + # Make Magicfilter + +install: + mkdir -p $(DESTDIR) + + # Install the binaries + mkdir -p $(DESTDIR)/usr/bin/ + + mkdir -p $(DESTDIR)/etc/alchemist/namespace/printconf + install -m 0644 adl_files/rpm.adl adl_files/local.adl $(DESTDIR)/etc/alchemist/namespace/printconf/ + + # drop in some basics + install -m 0644 printcap.local $(DESTDIR)/etc/ + +clean: + rm -rf *.pyc monitorplugins/*.pyc tuningplugins/*.pyc + +.PHONY: clean archive srpm tag + @@ -0,0 +1 @@ +Nothing here yet. diff --git a/contrib/diskdevstat.stp b/contrib/diskdevstat.stp index db098cb..a049a97 100755 --- a/contrib/diskdevstat.stp +++ b/contrib/diskdevstat.stp @@ -63,6 +63,7 @@ probe vfs.read function print_activity() { + printf("\033[2J\033[1;1H") printf("%5s %5s %-7s %9s %9s %9s %9s %9s %9s %9s %9s %-15s\n", "PID", "UID", "DEV", "WRITE_CNT", "WRITE_MIN", "WRITE_MAX", "WRITE_AVG", "READ_CNT", "READ_MIN", "READ_MAX", "READ_AVG", "COMMAND") diff --git a/contrib/netdevstat.stp b/contrib/netdevstat.stp index cfe6e9a..b5b0c2a 100755 --- a/contrib/netdevstat.stp +++ b/contrib/netdevstat.stp @@ -63,6 +63,7 @@ probe netdev.receive function print_activity() { + printf("\033[2J\033[1;1H") printf("%5s %5s %-7s %9s %9s %9s %9s %9s %9s %9s %9s %-15s\n", "PID", "UID", "DEV", "XMIT_CNT", "XMIT_MIN", "XMIT_MAX", "XMIT_AVG", "RECV_CNT", "RECV_MIN", "RECV_MAX", "RECV_AVG", "COMMAND") diff --git a/README.txt b/doc/README.txt index 40a1d9f..40a1d9f 100644 --- a/README.txt +++ b/doc/README.txt diff --git a/tuned.spec b/tuned.spec new file mode 100644 index 0000000..422b60f --- /dev/null +++ b/tuned.spec @@ -0,0 +1,48 @@ +Summary: A adaptive dynamic system tuning daemon +Name: tuned +Version: 0.1.0 +Release: 1%{?dist} +License: GPLv2+ +Group: System Environment/Daemons +Source: tuned-%{version}.tar.bz2 +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch + +%description +The tuned package contains a daemon that tunes system settings dynamically. + +%package utils +Summary: Disk and net monitoring systemtap scripts +Requires: kernel-debuginfo +Group: Applications/System + +%description utils +The tuned-utils package contains several systemtap scripts to allow detailed manual monitoring of the system. + +%prep +%setup -q + +%build + +%install +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%{bin}/tuned +%{datadir}/tuned.py +%{datadir}/monitorplugins +%{datadir}/tuningplugins + +%files utils +%{_bin}/netdevstat +%{_bin}/diskdevstat + + +%changelog +* Thu Feb 19 2009 Phil Knirsch <pknirsch@redhat.com> - 0.1.0-1 +- Initial version diff --git a/tuningplugins/disk.py b/tuningplugins/disk.py index 5bdcea2..638ca33 100644 --- a/tuningplugins/disk.py +++ b/tuningplugins/disk.py @@ -23,25 +23,26 @@ class DiskTuning: self.devidle = {} def __updateIdle__(self, dev, devload): + idle = self.devidle.setdefault(dev, {}) + idle.setdefault("LEVEL", 0) for type in ("READ", "WRITE"): if devload[type] == 0.0: - idle = self.devidle.setdefault(dev, {}) idle.setdefault(type, 0) idle[type] += 1 else: - idle = self.devidle.setdefault(dev, {}) idle.setdefault(type, 0) idle[type] = 0 def setTuning(self, load): disks = load.setdefault("DISK", {}) - oldidle = copy.deepcopy(self.devidle) for dev in disks.keys(): devload = disks[dev] self.__updateIdle__(dev, devload) - if self.devidle[dev]["READ"] == 30 or self.devidle[dev]["WRITE"] == 30: + if self.devidle[dev]["LEVEL"] == 0 and self.devidle[dev]["READ"] >= 30 and self.devidle[dev]["WRITE"] >= 30: + self.devidle[dev]["LEVEL"] = 1 os.system("hdparm -Y -S60 -B1 /dev/"+dev) - if oldidle.has_key(dev) and oldidle[dev]["READ"] > 30 and oldidle[dev]["WRITE"] > 30 and (self.devidle[dev]["READ"] == 0 or self.devidle[dev]["WRITE"] == 0): + if self.devidle[dev]["LEVEL"] > 0 and (self.devidle[dev]["READ"] == 0 or self.devidle[dev]["WRITE"] == 0): + self.devidle[dev]["LEVEL"] = 0 os.system("hdparm -S255 -B127 /dev/"+dev) print(load, self.devidle) diff --git a/tuningplugins/net.py b/tuningplugins/net.py index 8ac2db1..1245d90 100644 --- a/tuningplugins/net.py +++ b/tuningplugins/net.py @@ -23,25 +23,26 @@ class NetTuning: self.devidle = {} def __updateIdle__(self, dev, devload): + idle = self.devidle.setdefault(dev, {}) + idle.setdefault("LEVEL", 0) for type in ("READ", "WRITE"): - if devload[type] <= 0.005: - idle = self.devidle.setdefault(dev, {}) + if devload[type] <= 0.05: idle.setdefault(type, 0) idle[type] += 1 else: - idle = self.devidle.setdefault(dev, {}) idle.setdefault(type, 0) idle[type] = 0 def setTuning(self, load): disks = load.setdefault("NET", {}) - oldidle = copy.deepcopy(self.devidle) for dev in disks.keys(): devload = disks[dev] self.__updateIdle__(dev, devload) - if self.devidle[dev]["READ"] == 6 or self.devidle[dev]["WRITE"] == 6: - os.system("ethtool -s "+dev+" advertise 0x003") - if oldidle.has_key(dev) and oldidle[dev]["READ"] > 6 and oldidle[dev]["WRITE"] > 6 and (self.devidle[dev]["READ"] == 0 or self.devidle[dev]["WRITE"] == 0): + if self.devidle[dev]["LEVEL"] == 0 and self.devidle[dev]["READ"] >= 6 and self.devidle[dev]["WRITE"] >= 6: + self.devidle[dev]["LEVEL"] = 1 + os.system("ethtool -s "+dev+" advertise 0x00F") + if self.devidle[dev]["LEVEL"] > 0 and (self.devidle[dev]["READ"] == 0 or self.devidle[dev]["WRITE"] == 0): + self.devidle[dev]["LEVEL"] = 0 os.system("ethtool -s "+dev+" advertise 0x03F") print(load, self.devidle) |