summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/memory.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/libs/memory.php b/libs/memory.php
index 67fee34..81d9ac9 100644
--- a/libs/memory.php
+++ b/libs/memory.php
@@ -1,14 +1,19 @@
<?php
require 'Utils/Misc.class.php';
-// Free
-if (!($free = shell_exec('/usr/bin/free -to | grep Mem: | awk \'{print $4+$6+$7}\'')))
+$free = 0;
+
+if (shell_exec('cat /proc/meminfo'))
{
- $free = 0;
+ $free = shell_exec('grep MemFree /proc/meminfo | awk \'{print $2}\'');
+ $buffers = shell_exec('grep Buffers /proc/meminfo | awk \'{print $2}\'');
+ $cached = shell_exec('grep Cached /proc/meminfo | awk \'{print $2}\'');
+
+ $free = (int)$free + (int)$buffers + (int)$cached;
}
// Total
-if (!($total = shell_exec('/usr/bin/free -to | grep Mem: | awk \'{print $2}\'')))
+if (!($total = shell_exec('grep MemTotal /proc/meminfo | awk \'{print $2}\'')))
{
$total = 0;
}