From 4030160e538a616edfd896c5cf6481bb458aaabe Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 2 Dec 2008 00:07:43 +0100 Subject: fix disc handling for /dev/discs/disc in fstab ... --- lib/python/Components/Harddisk.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index f7c3a7cb..febd16dd 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -19,20 +19,22 @@ class Harddisk: s_minor = int(tmp[1]) for disc in listdir("/dev/discs"): path = readlink('/dev/discs/'+disc) - devidex = '/dev'+path[2:]+'/' - disc = devidex+'disc' + devidex = '/dev/discs/'+disc+'/' + devidex2 = '/dev'+path[2:]+'/' + disc = devidex2+'disc' ret = stat(disc).st_rdev if s_major == major(ret) and s_minor == minor(ret): self.devidex = devidex - print "new Harddisk", device, self.devidex + self.devidex2 = devidex2 + print "new Harddisk", device, '->', self.devidex, '->', self.devidex2 break def __lt__(self, ob): return self.device < ob.device def bus(self): - ide_cf = self.device.find("hd") == 0 and self.devidex.find("host0") == -1 # 7025 specific - internal = self.device.find("hd") == 0 and self.devidex + ide_cf = self.device.find("hd") == 0 and self.devidex2.find("host0") == -1 # 7025 specific + internal = self.device.find("hd") == 0 if ide_cf: ret = "External (CF)" elif internal: -- cgit v1.2.3 From b37fb8b50e48795882cd933c8ef9fe31b3ef007d Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Mon, 19 Jan 2009 02:16:11 +0100 Subject: rework block device scanning a bit --- data/menu.xml | 2 +- lib/python/Components/Harddisk.py | 100 ++++++++++++++++++--- lib/python/Plugins/SystemPlugins/Hotplug/plugin.py | 13 +-- 3 files changed, 89 insertions(+), 26 deletions(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/data/menu.xml b/data/menu.xml index 6bf5e3f2..7dc764ac 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -54,7 +54,7 @@ - + diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index febd16dd..8e30a512 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -2,6 +2,7 @@ from os import system, listdir, statvfs, popen, makedirs, readlink, stat, major, from Tools.Directories import SCOPE_HDD, resolveFilename from Tools.CList import CList from SystemInfo import SystemInfo +import string def tryOpen(filename): try: @@ -213,11 +214,12 @@ class Harddisk: return self.getDeviceDir() + "disc" class Partition: - def __init__(self, mountpoint, description = "", force_mounted = False): + def __init__(self, mountpoint, device = None, description = "", force_mounted = False): self.mountpoint = mountpoint self.description = description self.force_mounted = force_mounted self.is_hotplug = force_mounted # so far; this might change. + self.device = device def stat(self): return statvfs(self.mountpoint) @@ -247,6 +249,14 @@ class Partition: return True return False +DEVICEDB = \ + { + # dm8000: + "devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot", + "devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot", + "devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot", + } + class HarddiskManager: def __init__(self): self.hdd = [ ] @@ -307,37 +317,63 @@ class HarddiskManager: self.cd = blockdev except IOError: error = True - return error, blacklisted, removable, is_cdrom, partitions + # check for medium + medium_found = True + try: + open("/dev/" + blockdev).close() + except IOError, err: + if err.errno == 159: # no medium present + medium_found = False + + return error, blacklisted, removable, is_cdrom, partitions, medium_found def enumerateBlockDevices(self): print "enumerating block devices..." for blockdev in listdir("/sys/block"): - error, blacklisted, removable, is_cdrom, partitions = self.getBlockDevInfo(blockdev) + error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(blockdev) print "found block device '%s':" % blockdev, if error: print "error querying properties" elif blacklisted: print "blacklisted" + elif not medium_found: + print "no medium" else: print "ok, removable=%s, cdrom=%s, partitions=%s, device=%s" % (removable, is_cdrom, partitions, blockdev) - self.addHotplugPartition(blockdev, blockdev) + + self.addHotplugPartition(blockdev) for part in partitions: - self.addHotplugPartition(part, part) + self.addHotplugPartition(part) def getAutofsMountpoint(self, device): return "/autofs/%s/" % (device) - def addHotplugPartition(self, device, description): - p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True) + def addHotplugPartition(self, device, physdev = None): + if not physdev: + dev, part = self.splitDeviceName(device) + physdev = dev + try: + import os + physdev = os.readlink("/sys/block/" + dev + "/device")[6:] + except IOError: + print "couldn't determine blockdev physdev for device", dev + + # device is the device name, without /dev + # physdev is the physical device path, which we (might) use to determine the userfriendly name + description = self.getUserfriendlyDeviceName(device, physdev) + + p = Partition(mountpoint = self.getAutofsMountpoint(device), description = description, force_mounted = True, device = device) self.partitions.append(p) self.on_partition_list_change("add", p) + + # see if this is a harddrive l = len(device) - if l and device[l-1] not in ('0','1','2','3','4','5','6','7','8','9'): - error, blacklisted, removable, is_cdrom, partitions = self.getBlockDevInfo(device) - if not blacklisted and not removable and not is_cdrom: + if l and device[l-1] not in string.digits: + error, blacklisted, removable, is_cdrom, partitions, medium_found = self.getBlockDevInfo(device) + if not blacklisted and not removable and not is_cdrom and medium_found: self.hdd.append(Harddisk(device)) self.hdd.sort() - SystemInfo["Harddisc"] = len(self.hdd) > 0 + SystemInfo["Harddisk"] = len(self.hdd) > 0 def removeHotplugPartition(self, device): mountpoint = self.getAutofsMountpoint(device) @@ -346,13 +382,13 @@ class HarddiskManager: self.partitions.remove(x) self.on_partition_list_change("remove", x) l = len(device) - if l and device[l-1] not in ('0','1','2','3','4','5','6','7','8','9'): + if l and device[l-1] not in string.digits: idx = 0 for hdd in self.hdd: if hdd.device == device: del self.hdd[idx] break - SystemInfo["Harddisc"] = len(self.hdd) > 0 + SystemInfo["Harddisk"] = len(self.hdd) > 0 def HDDCount(self): return len(self.hdd) @@ -371,6 +407,42 @@ class HarddiskManager: return self.cd def getMountedPartitions(self, onlyhotplug = False): - return [x for x in self.partitions if (x.is_hotplug or not onlyhotplug) and x.mounted()] + parts = [x for x in self.partitions if (x.is_hotplug or not onlyhotplug) and x.mounted()] + devs = set([x.device for x in parts]) + for devname in devs.copy(): + if not devname: + continue + dev, part = self.splitDeviceName(devname) + if part and dev in devs: # if this is a partition and we still have the wholedisk, remove wholedisk + devs.remove(dev) + + # return all devices which are not removed due to being a wholedisk when a partition exists + return [x for x in parts if not x.device or x.device in devs] + + def splitDeviceName(self, devname): + dev = "" + part = "" + for i in devname: + if i in string.digits: + part += i + else: + dev += i + return dev, part and int(part) or 0 + + def getUserfriendlyDeviceName(self, dev, phys): + dev, part = self.splitDeviceName(dev) + description = "External Storage %s" % dev + try: + description = open("/sys/" + phys + "/model").read().strip() + except IOError, s: + print "couldn't read model (from /sys/" + phys + "/model): ", s + for physdevprefix, pdescription in DEVICEDB.items(): + if phys.startswith(physdevprefix): + description = pdescription + + # not wholedisk and not partition 1 + if part and part != 1: + description += " (Partition %d)" % part + return description harddiskmanager = HarddiskManager() diff --git a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py index e593e942..b19007c9 100644 --- a/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py +++ b/lib/python/Plugins/SystemPlugins/Hotplug/plugin.py @@ -3,17 +3,9 @@ from twisted.internet.protocol import Protocol, Factory from twisted.internet import reactor from Components.Harddisk import harddiskmanager -DEVICEDB = \ - { "/devices/pci0000:00/0000:00:14.2/usb1/1-1/1-1:1.0/host0/target0:0:0/0:0:0:0": "CF Slot", - "/devices/pci0000:00/0000:00:14.2/usb1/1-1/1-1:1.0/host0/target1:0:0/0:0:0:0": "SD Slot" - } - hotplugNotifier = [ ] class Hotplug(Protocol): - def getUserfriendlyDeviceName(self, phys): - return DEVICEDB.get(phys, "USB Storage") - def connectionMade(self): self.received = "" @@ -40,14 +32,13 @@ class Hotplug(Protocol): dev = device.split('/')[-1] if action is not None and action == "add": - print "Medium found in", self.getUserfriendlyDeviceName(dev) - harddiskmanager.addHotplugPartition(dev, self.getUserfriendlyDeviceName(physdevpath)) + harddiskmanager.addHotplugPartition(dev, physdevpath) elif action is not None and action == "remove": harddiskmanager.removeHotplugPartition(dev) elif media_state is not None: if media_state == '1': harddiskmanager.removeHotplugPartition(dev) - harddiskmanager.addHotplugPartition(dev, self.getUserfriendlyDeviceName(physdevpath)) + harddiskmanager.addHotplugPartition(dev, physdevpath) elif media_state == '0': harddiskmanager.removeHotplugPartition(dev) -- cgit v1.2.3 From 0621e74942fa09f300e8b63d5e586db4575ba180 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 19 Jan 2009 11:12:54 +0100 Subject: use OSError instead of IOError and small fix for sr devices --- lib/python/Components/Harddisk.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 8e30a512..d739e984 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -351,12 +351,15 @@ class HarddiskManager: def addHotplugPartition(self, device, physdev = None): if not physdev: dev, part = self.splitDeviceName(device) - physdev = dev try: - import os - physdev = os.readlink("/sys/block/" + dev + "/device")[6:] - except IOError: - print "couldn't determine blockdev physdev for device", dev + physdev = readlink("/sys/block/" + dev + "/device")[6:] + except OSError: + print "couldn't determine blockdev physdev for device", dev, "try", device, "now" + try: + physdev = readlink("/sys/block/" + device + "/device")[6:] + except OSError: + physdev = dev + print "couldn't determine blockdev physdev for device", device # device is the device name, without /dev # physdev is the physical device path, which we (might) use to determine the userfriendly name -- cgit v1.2.3 From c668e555f7f57a878b8295abfeeb87d0f4550fbd Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Mon, 19 Jan 2009 14:10:02 +0100 Subject: physdev path start with /, like in hotplug. add dvd drive into devicedb. fix scanner component. fix splitDeviceName for sr0-like devices. --- lib/python/Components/Harddisk.py | 34 +++++++++++++++------------------- lib/python/Components/Scanner.py | 2 +- 2 files changed, 16 insertions(+), 20 deletions(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index d739e984..ad7f28de 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -252,9 +252,10 @@ class Partition: DEVICEDB = \ { # dm8000: - "devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot", - "devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot", - "devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot", + "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.1/1-1.1:1.0": "Front USB Slot", + "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.2/1-1.2:1.0": "Back, upper USB Slot", + "/devices/platform/brcm-ehci.0/usb1/1-1/1-1.3/1-1.3:1.0": "Back, lower USB Slot", + "/devices/platform/brcm-ehci-1.1/usb2/2-1/2-1:1.0/host1/target1:0:0/1:0:0:0": "DVD Drive", } class HarddiskManager: @@ -352,14 +353,10 @@ class HarddiskManager: if not physdev: dev, part = self.splitDeviceName(device) try: - physdev = readlink("/sys/block/" + dev + "/device")[6:] + physdev = readlink("/sys/block/" + dev + "/device")[5:] except OSError: - print "couldn't determine blockdev physdev for device", dev, "try", device, "now" - try: - physdev = readlink("/sys/block/" + device + "/device")[6:] - except OSError: - physdev = dev - print "couldn't determine blockdev physdev for device", device + physdev = dev + print "couldn't determine blockdev physdev for device", device # device is the device name, without /dev # physdev is the physical device path, which we (might) use to determine the userfriendly name @@ -423,22 +420,21 @@ class HarddiskManager: return [x for x in parts if not x.device or x.device in devs] def splitDeviceName(self, devname): - dev = "" - part = "" - for i in devname: - if i in string.digits: - part += i - else: - dev += i + # this works for: sdaX, hdaX, sr0 (which is in fact dev="sr0", part=""). It doesn't work for other names like mtdblock3, but they are blacklisted anyway. + dev = devname[:3] + part = devname[3:] + for p in part: + if p not in string.digits: + return devname, 0 return dev, part and int(part) or 0 def getUserfriendlyDeviceName(self, dev, phys): dev, part = self.splitDeviceName(dev) description = "External Storage %s" % dev try: - description = open("/sys/" + phys + "/model").read().strip() + description = open("/sys" + phys + "/model").read().strip() except IOError, s: - print "couldn't read model (from /sys/" + phys + "/model): ", s + print "couldn't read model: ", s for physdevprefix, pdescription in DEVICEDB.items(): if phys.startswith(physdevprefix): description = pdescription diff --git a/lib/python/Components/Scanner.py b/lib/python/Components/Scanner.py index 766d1966..86a5431d 100644 --- a/lib/python/Components/Scanner.py +++ b/lib/python/Components/Scanner.py @@ -135,7 +135,7 @@ def scanDevice(mountpoint): from Components.Harddisk import harddiskmanager blockdev = mountpoint.rstrip("/").rsplit('/',1)[-1] - error, blacklisted, removable, is_cdrom, partitions = harddiskmanager.getBlockDevInfo(blockdev) + error, blacklisted, removable, is_cdrom, partitions, medium_found = harddiskmanager.getBlockDevInfo(blockdev) # now scan the paths for p in paths_to_scan: -- cgit v1.2.3 From fdc322a811049c371bd7dbdb75192534cebd36c8 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Tue, 27 Jan 2009 18:57:33 +0100 Subject: don't rely on hdd standby timer, but manage own idle timer. --- lib/python/Components/Harddisk.py | 64 +++++++++++++++++++++++++++++++++++- lib/python/Components/UsageConfig.py | 14 ++++---- 2 files changed, 70 insertions(+), 8 deletions(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index ad7f28de..1fc629a0 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -2,7 +2,8 @@ from os import system, listdir, statvfs, popen, makedirs, readlink, stat, major, from Tools.Directories import SCOPE_HDD, resolveFilename from Tools.CList import CList from SystemInfo import SystemInfo -import string +import string, time +from Components.Console import Console def tryOpen(filename): try: @@ -18,6 +19,8 @@ class Harddisk: tmp = procfile.readline().split(':') s_major = int(tmp[0]) s_minor = int(tmp[1]) + self.max_idle_time = 0 + self.idle_running = False for disc in listdir("/dev/discs"): path = readlink('/dev/discs/'+disc) devidex = '/dev/discs/'+disc+'/' @@ -28,6 +31,7 @@ class Harddisk: self.devidex = devidex self.devidex2 = devidex2 print "new Harddisk", device, '->', self.devidex, '->', self.devidex2 + self.startIdle() break def __lt__(self, ob): @@ -213,6 +217,64 @@ class Harddisk: def getDeviceName(self): return self.getDeviceDir() + "disc" + # the HDD idle poll daemon. + # as some harddrives have a buggy standby timer, we are doing this by hand here. + # first, we disable the hardware timer. then, we check every now and then if + # any access has been made to the disc. If there has been no access over a specifed time, + # we set the hdd into standby. + def readStats(self): + l = open("/sys/block/%s/stat" % self.device).read() + nr_read = int(l[:8].strip()) + nr_write = int(l[4*9:4*9+8].strip()) + return nr_read, nr_write + + def startIdle(self): + self.last_access = time.time() + self.last_stat = 0 + self.is_sleeping = False + from enigma import eTimer + + # disable HDD standby timer + Console().ePopen(("hdparm", "hdparm", "-S0", (self.devidex + "disc"))) + self.timer = eTimer() + self.timer.callback.append(self.runIdle) + self.idle_running = True + self.setIdleTime(self.max_idle_time) # kick the idle polling loop + + def runIdle(self): + if not self.max_idle_time: + return + t = time.time() + + idle_time = t - self.last_access + + l = sum(self.readStats()) + + if l != self.last_stat: # access + self.last_stat = l + self.last_access = t + self.idle_time = 0 + self.is_sleeping = False + + #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 + + def setSleep(self): + Console().ePopen(("hdparm", "hdparm", "-y", (self.devidex + "disc"))) + + def setIdleTime(self, idle): + self.max_idle_time = idle + if self.idle_running: + if not idle: + self.timer.stop() + else: + self.timer.start(idle * 250, False) # poll 4 times per period. + + def isSleeping(self): + return self.is_sleeping + class Partition: def __init__(self, mountpoint, device = None, description = "", force_mounted = False): self.mountpoint = mountpoint diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py index 2ea91aeb..21e057f2 100644 --- a/lib/python/Components/UsageConfig.py +++ b/lib/python/Components/UsageConfig.py @@ -17,12 +17,12 @@ def InitUsageConfig(): config.usage.show_infobar_on_zap = ConfigYesNo(default = True) config.usage.show_infobar_on_skip = ConfigYesNo(default = True) config.usage.show_infobar_on_event_change = ConfigYesNo(default = True) - config.usage.hdd_standby = ConfigSelection(default = "120", choices = [ - ("0", _("no standby")), ("2", "10 " + _("seconds")), ("6", "30 " + _("seconds")), - ("12", "1 " + _("minute")), ("24", "2 " + _("minutes")), - ("60", "5 " + _("minutes")), ("120", "10 " + _("minutes")), ("240", "20 " + _("minutes")), - ("241", "30 " + _("minutes")), ("242", "1 " + _("hour")), ("244", "2 " + _("hours")), - ("248", "4 " + _("hours")) ]) + config.usage.hdd_standby = ConfigSelection(default = "600", choices = [ + ("0", _("no standby")), ("10", "10 " + _("seconds")), ("30", "30 " + _("seconds")), + ("60", "1 " + _("minute")), ("120", "2 " + _("minutes")), + ("300", "5 " + _("minutes")), ("600", "10 " + _("minutes")), ("1200", "20 " + _("minutes")), + ("1800", "30 " + _("minutes")), ("3600", "1 " + _("hour")), ("7200", "2 " + _("hours")), + ("14400", "4 " + _("hours")) ]) config.usage.output_12V = ConfigSelection(default = "do not change", choices = [ ("do not change", _("do not change")), ("off", _("off")), ("on", _("on")) ]) @@ -66,7 +66,7 @@ def InitUsageConfig(): def setHDDStandby(configElement): for hdd in harddiskmanager.HDDList(): - os.system("hdparm -S%s %s" % (configElement.value, hdd[1].getDeviceName())) + hdd[1].setIdleTime(int(configElement.value)) config.usage.hdd_standby.addNotifier(setHDDStandby) def set12VOutput(configElement): -- cgit v1.2.3 From c7e822df550005a8b359604d005d8da74b937152 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 2 Feb 2009 13:11:04 +0100 Subject: now the code is working for /dev/ide/discs/discX mounts and direkt mounts to /dev/ide/hostX/busX/... --- lib/python/Components/Harddisk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 1fc629a0..9cf9b4a2 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -97,7 +97,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]) -- cgit v1.2.3 From 337572d8d61c37c2121a96ec7ab79e191eaa2e29 Mon Sep 17 00:00:00 2001 From: ghost Date: Tue, 3 Feb 2009 15:47:13 +0100 Subject: also check devidex2 here --- lib/python/Components/Harddisk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 9cf9b4a2..404baafa 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -130,7 +130,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]]) -- cgit v1.2.3 From b6b788b0f8da7e1adcde03cebb464da484f48508 Mon Sep 17 00:00:00 2001 From: ghost Date: Fri, 6 Feb 2009 16:39:08 +0100 Subject: check harddisc idle 10 times per period add some debug output --- lib/python/Components/Harddisk.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 404baafa..44245ebb 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -248,15 +248,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 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 +276,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 -- cgit v1.2.3 From b7f0a4fed2bf0249c9bffc3cc185688748ab3058 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Tue, 10 Feb 2009 15:02:13 +0100 Subject: stop idle timer when removing a harddisk --- lib/python/Components/Harddisk.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 44245ebb..470055e4 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 @@ -454,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 -- cgit v1.2.3 From eb6da808cc048f7a2e78c200094d290c5b3f2579 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Tue, 10 Feb 2009 16:04:03 +0100 Subject: fix sleep-after-access --- lib/python/Components/Harddisk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/python/Components/Harddisk.py') diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index 470055e4..6c6c3c6c 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -263,7 +263,7 @@ class Harddisk: 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!" -- cgit v1.2.3