git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop idle timer when removing a harddisk
[enigma2.git]
/
lib
/
python
/
Components
/
Harddisk.py
diff --git
a/lib/python/Components/Harddisk.py
b/lib/python/Components/Harddisk.py
index 404baafa0718cb7d54981e52a11843aff388c3f5..470055e4f2bbb2394b1e8f4eccfb7078d70ee32c 100644
(file)
--- 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
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+'/'
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 __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
def bus(self):
ide_cf = self.device.find("hd") == 0 and self.devidex2.find("host0") == -1 # 7025 specific
internal = self.device.find("hd") == 0
@@
-248,15
+254,21
@@
class Harddisk:
idle_time = t - self.last_access
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
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
self.is_sleeping = False
self.last_stat = l
self.last_access = t
self.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
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:
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
def isSleeping(self):
return self.is_sleeping
@@
-448,6
+460,7
@@
class HarddiskManager:
idx = 0
for hdd in self.hdd:
if hdd.device == device:
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
del self.hdd[idx]
break
SystemInfo["Harddisk"] = len(self.hdd) > 0