l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/memory] Use /proc/meminfo instead of psutil

Browse source 
Try to be more accurate in calculating memory by using the /proc/meminfo
interface directly.

fixes #181
This commit is contained in:
Tobias Witek 2017-09-20 06:26:39 +02:00
parent 18131a3efe
commit 81e1b25687
1 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
bumblebee/modules/memory.py
View file

@ -9,22 +9,24 @@ Parameters:
* memory.usedonly: Only show the amount of RAM in use (defaults to False). Same as memory.format="{used}" * memory.usedonly: Only show the amount of RAM in use (defaults to False). Same as memory.format="{used}"
""" """
try: import re
import psutil
except ImportError:
pass
import bumblebee.util import bumblebee.util
import bumblebee.input import bumblebee.input
import bumblebee.output import bumblebee.output
import bumblebee.engine import bumblebee.engine
class Container(object):
def __init__(self, **kwargs):
self.__dict__.update(kwargs)
class Module(bumblebee.engine.Module): class Module(bumblebee.engine.Module):
def __init__(self, engine, config): def __init__(self, engine, config):
super(Module, self).__init__(engine, config, super(Module, self).__init__(engine, config,
bumblebee.output.Widget(full_text=self.memory_usage) bumblebee.output.Widget(full_text=self.memory_usage)
) )
self._mem = psutil.virtual_memory() self.update(None)
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE,
cmd="gnome-system-monitor") cmd="gnome-system-monitor")
@ -36,18 +38,30 @@ class Module(bumblebee.engine.Module):
return self.parameter("format", "{used}/{total} ({percent:05.02f}%)") return self.parameter("format", "{used}/{total} ({percent:05.02f}%)")
def memory_usage(self, widget): def memory_usage(self, widget):
used = bumblebee.util.bytefmt(self._mem.total - self._mem.available) return self._format.format(**self._mem)
total = bumblebee.util.bytefmt(self._mem.total)
return self._format.format(used=used, total=total, percent=self._mem.percent)
def update(self, widgets): def update(self, widgets):
self._mem = psutil.virtual_memory() data = {}
with open("/proc/meminfo", "r") as f:
for line in f:
tmp = re.split(r"[:\s]+", line)
value = int(tmp[1])
if tmp[2] == "kB": value = value*1024
if tmp[2] == "mB": value = value*1024*1024
if tmp[2] == "gB": value = value*1024*1024*1024
data[tmp[0]] = value
self._mem = {
"total": bumblebee.util.bytefmt(data["MemTotal"]),
"available": bumblebee.util.bytefmt(data["MemAvailable"]),
"free": bumblebee.util.bytefmt(data["MemFree"]),
"used": bumblebee.util.bytefmt(data["MemTotal"] - data["MemFree"] - data["Buffers"] - data["Cached"] - data["Slab"]),
"percent": (float(data["MemTotal"] - data["MemAvailable"])/data["MemTotal"])*100
}
def state(self, widget): def state(self, widget):
if self._mem.percent > float(self.parameter("critical", 90)): if self._mem["percent"] > float(self.parameter("critical", 90)):
return "critical" return "critical"
if self._mem.percent > float(self.parameter("warning", 80)): if self._mem["percent"] > float(self.parameter("warning", 80)):
return "warning" return "warning"
return None return None