wmtop: Fix incorrect memory usage.

Patch by Dwayne C. Litzenberger <dlitz@dlitz.net> to fix Debian bug #224732.

Obtained from [1].

[1] https://sources.debian.net/src/wmtop/0.84-12/debian/patches/fix_incorrect_memory_usage.patch/
This commit is contained in:
Doug Torrance 2016-02-07 21:36:17 -05:00 committed by Carlos R. Mafra
parent 1c9780cfbe
commit 229fe58553

View file

@ -843,7 +843,7 @@ void calc_cpu_each(int total) {
#if defined(LINUX) #if defined(LINUX)
int calc_mem_total() { int calc_mem_total() {
int ps; int ps;
char line[512]; char line[1024];
char *ptr; char *ptr;
int rc; int rc;
@ -853,13 +853,16 @@ int calc_mem_total() {
if (rc<0) if (rc<0)
return 0; return 0;
if ((ptr = strstr(line, "Mem:")) == NULL) { if ((ptr = strstr(line, "Mem:")) != NULL) {
return 0;
} else {
ptr += 4; ptr += 4;
return atoi(ptr); return atoi(ptr);
} else if ((ptr = strstr(line, "MemTotal:")) != NULL) {
/* The "Mem:" line has been removed in Linux 2.6 */
ptr += 9;
return atoi(ptr) << 10; /* MemTotal is given in kiB */
} else {
return 0;
} }
} }
#endif /* defined(LINUX) */ #endif /* defined(LINUX) */