Changeset 174

Timestamp:

07/09/2005 07:12:19 PM (3 years ago)

Author:

petli

Message:

Support Linux 2.6 cpu freq interface

Location:

trunk

Files:

• examples/petliwm.py (modified) (4 diffs)
• plwm/__init__.py (modified) (2 diffs)
• plwm/mw_acpi.py (modified) (5 diffs)

trunk/examples/petliwm.py

@@ -38 +38 @@
      modewindow, modestatus, \
      mw_clock, mw_acpi, \
+     mw_watchfiles, \
      inspect, misc, input
 
@@ -185 +186 @@
            mw_clock.ModeWindowClock,
            mw_acpi.ModeWindowACPI,
+           mw_watchfiles.ModeWindowWatchFiles,
            inspect.InspectServer,
            ModeWindowTraceIM,
@@ -191 +193 @@
     mw_acpi_position = 0
     mw_acpi_justification = modewindow.LEFT
+
+    mw_watchfiles_position = 0.85
+    mw_watchfiles_justification = modewindow.RIGHT
+
+    mw_watchfiles = (mw_watchfiles.WatchedFile('/var/run/laptop-mode-enabled',
+                                               present_msg = '',
+                                               missing_msg = 'LTM OFF'),
+                     mw_watchfiles.WatchedFile('/var/run/network-error',
+                                               present_msg = 'NET: %s',
+                                               format_content = 1)
+                     )
+
+    mw_watchfiles_interval = 5
     
     client_class = MyClient
@@ -297 +312 @@
 
     def F3(self, evt):
-        self.wm.current_screen.view_find_with_client(Or(name('Gecko'),
+        self.wm.current_screen.view_find_with_client(Or(name('Firefox-bin'),
                                                         name('Mozilla'),
                                                         name('Netscape'),

trunk/plwm/__init__.py

@@ -1 @@
-# $Id: __init__.py,v 1.9 2004-11-12 23:09:14 petli Exp $
+# $Id: __init__.py,v 1.10 2005-07-10 00:12:19 petli Exp $
 #
 # __init__.py for package plwm
@@ -41 +41 @@
             'mw_clock',
             'mw_load',
+            'mw_watchfiles',
             'outline',
             'panes',

trunk/plwm/mw_acpi.py

@@ -1 @@
-# $Id: mw_acpi.py,v 1.1 2004-11-12 23:09:14 petli Exp $
+# $Id: mw_acpi.py,v 1.2 2005-07-10 00:12:19 petli Exp $
 # -*- coding: iso-8859-1 -*-
 #
@@ -207 +207 @@
 
             info = linux_proc_read_info(path)
-            self.has_performance = info[self.PERFORMANCE_MANAGEMENT] == 'yes'
-            self.has_throttling = info[self.THROTTLING_CONTROL] == 'yes'
+            self.has_performance = info.get(self.PERFORMANCE_MANAGEMENT) == 'yes'
+            self.has_throttling = info.get(self.THROTTLING_CONTROL) == 'yes'
 
             if not self.has_performance and not self.has_throttling:
@@ -312 +312 @@
                 return 0
 
+
+    # Not really ACPI, this one.  But on Linux 2.6 kernels, the CPU frequency isn't 
+    # displayed in the ACPI interface, but from the cpu-freq module.
+    
+    class CpuFreqScaling:
+        EVENT = None
+        PROC_DIR = '/sys/devices/system/cpu'
+
+        SCALING_CPU_FREQ = '%s/cpufreq/scaling_cur_freq'
+        
+        def __init__(self, id, path):
+            self.id = id
+            self.path = path
+
+            self.scaling_cpu_freq = self.SCALING_CPU_FREQ % (path, )
+            
+            self.messsage = ''
+
+            # frequency in kHz
+            self.freq = None
+
+            self.update()
+
+        def update(self):
+            try:
+                new_freq = int(open(self.scaling_cpu_freq).read(50))
+            except (IOError, ValueError), e:
+                raise BadInfo('bad cpufreq: %s: %s' % (self.scaling_cpu_freq, e))
+            
+            if self.freq != new_freq:
+                self.freq = new_freq
+                self.message = '%d MHz' % (self.freq / 1000)
+                return 1
+            else:
+                return 0
+
     
     def __init__(self):
@@ -381 +417 @@
             self.add_units(self.Battery)
             self.add_units(self.Processor)
+            self.add_units(self.CpuFreqScaling)
             self.add_units(self.ThermalZone)
 
@@ -515 +552 @@
                 self.mw_acpi_update(newstatus)
             else:
-                wmanager.debug('acpi', 'event socket closed: %s', e)
+                wmanager.debug('acpi', 'event socket closed')
                 self.mw_acpi_socket.close()
                 self.mw_acpi_socket = None