- Added full network support

- Moved docs around a bit

2 files changed, 54 insertions, 4 deletions

diff --git a/tuningplugins/disk.py b/tuningplugins/disk.py
index e41403f..5bdcea2 100644
--- a/tuningplugins/disk.py
+++ b/tuningplugins/disk.py
@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-import os
+import os, copy
 
 class DiskTuning:
 	def __init__(self):
@@ -35,12 +35,14 @@ class DiskTuning:
 
 	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 and self.devidle[dev]["WRITE"] == 30:
-				os.system("hdparm -S5 /dev/"+dev)
-    				os.system("hdparm -B1 /dev/"+dev)
+			if self.devidle[dev]["READ"] == 30 or self.devidle[dev]["WRITE"] == 30:
+				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):
+				os.system("hdparm -S255 -B127 /dev/"+dev)
 		print(load, self.devidle)
 
 _plugin = DiskTuning()
diff --git a/tuningplugins/net.py b/tuningplugins/net.py
new file mode 100644
index 0000000..8ac2db1
--- /dev/null
+++ b/tuningplugins/net.py
@@ -0,0 +1,48 @@
+# 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 os, copy
+
+class NetTuning:
+	def __init__(self):
+		self.devidle = {}
+
+	def __updateIdle__(self, dev, devload):
+		for type in ("READ", "WRITE"):
+			if devload[type] <= 0.005:
+				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("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):
+				os.system("ethtool -s "+dev+" advertise 0x03F")
+		print(load, self.devidle)
+
+_plugin = NetTuning()