kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mem gadget: adjust a little bit the values calculation 

Now the gadget show EXACTLY the same values of the free command on my machine,
but note: I found at least 3 different implementation of procpc so your values could be a bit different.
This commit is contained in:
Davide Andreoli 2017-01-30 21:23:23 +01:00
parent aeda6dfac6
commit 5153321f0c
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/sysinfo/memusage/memusage_proc.c
View File

@ -21,9 +21,11 @@ void _memusage_proc_getusage(unsigned long *mem_total,
{ {
char line[256]; char line[256];
int found = 0; int found = 0;
long tmp_swp_total = -1; unsigned long tmp_swp_total = 0;
long tmp_swp_free = -1; unsigned long tmp_swp_free = 0;
long tmp_mem_free = -1; unsigned long tmp_mem_free = 0;
unsigned long tmp_mem_cached = 0;
unsigned long tmp_mem_slab = 0;
FILE *f; FILE *f;
*mem_total = 0; *mem_total = 0;
@ -51,7 +53,12 @@ void _memusage_proc_getusage(unsigned long *mem_total,
} }
else if (!strncmp("Cached:", line, 7)) else if (!strncmp("Cached:", line, 7))
{ {
*mem_cached = _line_parse(line); tmp_mem_cached = _line_parse(line);
found++;
}
else if (!strncmp("Slab:", line, 5))
{
tmp_mem_slab = _line_parse(line);
found++; found++;
} }
else if (!strncmp("Buffers:", line, 8)) else if (!strncmp("Buffers:", line, 8))
@ -75,20 +82,14 @@ void _memusage_proc_getusage(unsigned long *mem_total,
found++; found++;
} }
if (found >= 7) if (found >= 8)
break; break;
} }
fclose(f); fclose(f);
if ((tmp_mem_free != -1) && (*mem_total)) *mem_cached = tmp_mem_cached + tmp_mem_slab;
{ *mem_used = *mem_total - tmp_mem_free - *mem_cached - *mem_buffers;
*mem_used = *mem_total - tmp_mem_free -
*mem_cached - *mem_buffers - *mem_shared;
}
if ((tmp_swp_total != -1) && (tmp_swp_free != -1)) *swp_total = tmp_swp_total;
{ *swp_used = tmp_swp_total - tmp_swp_free;
*swp_total = tmp_swp_total;
*swp_used = tmp_swp_total - tmp_swp_free;
}
} }