From 00ff5d213e55c000661afcfe6d6db1514c7222d9 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 28 Feb 2014 21:01:07 +0100 Subject: add loadavg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- examples/plugin-test | 16 ++++++++++++++-- src/plugins/loadavg.py | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 src/plugins/loadavg.py diff --git a/examples/plugin-test b/examples/plugin-test index fda91aa..301c99c 100644 --- a/examples/plugin-test +++ b/examples/plugin-test @@ -2,10 +2,14 @@ # A simple xpybar configuration example that tests the plugins + from plugins.uptime import Uptime +from plugins.loadavg import AverageLoad + OUTPUT, HEIGHT, YPOS, TOP = 0, 24, 24, True + def redraw(): bar.clear() @@ -14,7 +18,15 @@ def redraw(): tot_idle = '%id %02i:%02i:%0.2f' % uptime_.total_idle avg_idle = '%id %02i:%02i:%0.2f' % uptime_.average_idle - text = 'Uptime: %s │ Idle time: %s %s' - text %= (uptime, tot_idle, avg_idle) + loadavg_ = AverageLoad() + avg_5 = int(loadavg_.avg_5_min * 100) + avg_10 = int(loadavg_.avg_10_min * 100) + avg_15 = int(loadavg_.avg_15_min * 100) + act_tasks = loadavg_.active_tasks + tot_tasks = loadavg_.total_tasks + last_pid = loadavg_.last_pid + + text = 'Uptime: %s │ Idle time: %s %s │ Average load: %2i%% %2i%% %2i%% %i/%i %i' + text %= (uptime, tot_idle, avg_idle, avg_5, avg_10, avg_15, act_tasks, tot_tasks, last_pid) bar.draw_coloured_text(0, 10, 0, 2, text) diff --git a/src/plugins/loadavg.py b/src/plugins/loadavg.py new file mode 100644 index 0000000..fc61c62 --- /dev/null +++ b/src/plugins/loadavg.py @@ -0,0 +1,52 @@ +# -*- python -*- +''' +xpybar – xmobar replacement written in python +Copyright © 2014 Mattias Andrée (maandree@member.fsf.org) + +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 3 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, see . +''' + +from util import * + + +class AverageLoad: + ''' + The current average load, number of scheduling entities and latest PID + + @variable avg_5_min:float The average load over the last 5 minutes + @variable avg_10_min:float The average load over the last 10 minutes + @variable avg_15_min:float The average load over the last 15 minutes + @variable active_tasks:int The number of active scheduling entities + @variable total_tasks:int The total number of scheduling entities + @variable last_pid:int The PID of the last created process on the system + ''' + + + def __init__(self): + ''' + Constructor + ''' + uptime = None + with open('/proc/loadavg', 'rb') as file: + uptime = file.read() + uptime = uptime.decode('utf-8', 'replace') + uptime = uptime.replace('\n', ' ').split(' ') + + self.avg_5_min, self.avg_10_min, self.avg_15_min, tasks, self.last_pid = uptime[:5] + self.avg_5_min = float(self.avg_5_min) + self.avg_10_min = float(self.avg_10_min) + self.avg_15_min = float(self.avg_15_min) + self.last_pid = int(self.last_pid) + self.active_tasks, self.total_tasks = [int(t) for t in tasks.split('/')] + -- cgit v1.2.3-70-g09d2