X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/979f7263f0c8807dce237fcfb5586112c55e5e20..544e1af49c6c1c25a3ef97b27ac3e6764a008824:/lib/python/Components/Harddisk.py

diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index 1fc629a0..6c6c3c6c 100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -21,6 +21,7 @@ class Harddisk:
 		s_minor = int(tmp[1])
 		self.max_idle_time = 0
 		self.idle_running = False
+		self.timer = None
 		for disc in listdir("/dev/discs"):
 			path = readlink('/dev/discs/'+disc)
 			devidex = '/dev/discs/'+disc+'/'
@@ -37,6 +38,11 @@ class Harddisk:
 	def __lt__(self, ob):
 		return self.device < ob.device
 
+	def stop(self):
+		if self.timer:
+			self.timer.stop()
+			self.timer.callback.remove(self.runIdle)
+
 	def bus(self):
 		ide_cf = self.device.find("hd") == 0 and self.devidex2.find("host0") == -1 # 7025 specific
 		internal = self.device.find("hd") == 0
@@ -97,7 +103,7 @@ class Harddisk:
 			line = procfile.readline()
 			if line == "":
 				break
-			if line.startswith(self.devidex):
+			if line.startswith(self.devidex) or line.startswith(self.devidex2):
 				parts = line.strip().split(" ")
 				try:
 					stat = statvfs(parts[1])
@@ -130,7 +136,7 @@ class Harddisk:
 		cmd = "/bin/umount"
 
 		for line in procfile:
-			if line.startswith(self.devidex):
+			if line.startswith(self.devidex) or line.startswith(self.devidex2):
 				parts = line.split()
 				cmd = ' '.join([cmd, parts[1]])
 
@@ -248,15 +254,21 @@ class Harddisk:
 
 		idle_time = t - self.last_access
 
-		l = sum(self.readStats())
+		stats = self.readStats()
+		print "nr_read", stats[0], "nr_write", stats[1]
+		l = sum(stats)
+		print "sum", l, "prev_sum", self.last_stat
 
 		if l != self.last_stat: # access
+			print "hdd was accessed since previous check!"
 			self.last_stat = l
 			self.last_access = t
-			self.idle_time = 0
+			idle_time = 0
 			self.is_sleeping = False
+		else:
+			print "hdd IDLE!"
 
-		#print "[IDLE]", idle_time, self.max_idle_time, self.is_sleeping
+		print "[IDLE]", idle_time, self.max_idle_time, self.is_sleeping
 		if idle_time >= self.max_idle_time and not self.is_sleeping:
 			self.setSleep()
 			self.is_sleeping = True
@@ -270,7 +282,7 @@ class Harddisk:
 			if not idle:
 				self.timer.stop()
 			else:
-				self.timer.start(idle * 250, False)  # poll 4 times per period.
+				self.timer.start(idle * 100, False)  # poll 10 times per period.
 
 	def isSleeping(self):
 		return self.is_sleeping
@@ -448,6 +460,7 @@ class HarddiskManager:
 			idx = 0
 			for hdd in self.hdd:
 				if hdd.device == device:
+					self.hdd[x].stop()
 					del self.hdd[idx]
 					break
 			SystemInfo["Harddisk"] = len(self.hdd) > 0