alex
/
gluon-firmware2
forked from Freifunk-Leipzig/gluon-firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1517 from blocktrron/pr-memory-calculation

This commit is contained in:
Matthias Schiffer 2018-08-25 01:55:01 +02:00 committed by GitHub
parent 20d22f66dd 02dfc66438
commit d3d6637c7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-respondd/src/respondd.c
View File

@ -197,6 +197,8 @@ static struct json_object * get_memory(void) {
json_object_object_add(ret, "total", json_object_new_int(value));
else if (!strcmp(label, "MemFree"))
json_object_object_add(ret, "free", json_object_new_int(value));
else if (!strcmp(label, "MemAvailable"))
json_object_object_add(ret, "available", json_object_new_int(value));
else if (!strcmp(label, "Buffers"))
json_object_object_add(ret, "buffers", json_object_new_int(value));
else if (!strcmp(label, "Cached"))

2
package/gluon-status-page/javascript/status-page.js
View File

@ -74,7 +74,7 @@
return _['%s used'].sprintf(formatNumber(100 * value, 3) + '%');
},
'memory': function(memory) {
var usage = 1 - (memory.free + memory.buffers + memory.cached) / memory.total
var usage = 1 - memory.available / memory.total
return formats.percent(usage);
},
'time': function(seconds) {