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 /tuningplugins | |
| parent | 5818e327421ff22f41618c7b9fa74be8d23d4fd5 (diff) | |
| download | tuned-c02f25afb09ff1f38484a8b69c4dcc85ed2378c7.tar.gz tuned-c02f25afb09ff1f38484a8b69c4dcc85ed2378c7.tar.xz tuned-c02f25afb09ff1f38484a8b69c4dcc85ed2378c7.zip | |
- Lots of updates to packaging and installation (specfile, makefile)
Diffstat (limited to 'tuningplugins')
| -rw-r--r-- | tuningplugins/disk.py | 11 | ||||
| -rw-r--r-- | tuningplugins/net.py | 15 |
2 files changed, 14 insertions, 12 deletions
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) |