Skip to content

Use MemAvailable in /proc/meminfo for memory available to user. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 11, 2015
Merged

Use MemAvailable in /proc/meminfo for memory available to user. #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e302106
Use MemAvailable in /proc/meminfo for memory available to user.
Apr 11, 2015
b125816
Only use MemAvailable for Linux kernels >= 3.16.
Apr 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions sensors.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import logging
import re
import os
import platform
from gettext import gettext as _

import psutil as ps
Expand Down Expand Up @@ -390,12 +391,22 @@ def _fetch_mem(self):
"""It gets the total memory info and return the used in percent."""
with open('/proc/meminfo') as meminfo:
total = SensorManager.digit_regex.findall(meminfo.readline()).pop()
free = SensorManager.digit_regex.findall(meminfo.readline()).pop()
meminfo.readline()
cached = SensorManager.digit_regex.findall(
meminfo.readline()).pop()
free = int(free) + int(cached)
return 100 - 100 * free / float(total)
release = re.split('\.', platform.release())
major_version = int(release[0])
minor_version = int(release[1])
if (minor_version >= 16 and major_version >= 3):
meminfo.readline()
available = SensorManager.digit_regex.findall(
meminfo.readline()).pop()
return 100 - 100 * int(available) / float(total)
else:
free = SensorManager.digit_regex.findall(
meminfo.readline()).pop()
meminfo.readline()
cached = SensorManager.digit_regex.findall(
meminfo.readline()).pop()
free = int(free) + int(cached)
return 100 - 100 * free / float(total)


class NetSensor(BaseSensor):
Expand Down