QubesOS/qubes-linux-utils
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use 64-bit integers for memory sizes to support > 2 TB RAM

Browse Source
This commit is contained in:
qubesuser 2015-10-10 01:37:30 +02:00
parent 2d871075cc
commit 2f5ef8e2aa
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qmemman/meminfo-writer.c
View File

@ -20,17 +20,17 @@ const char *parse(const char *meminfo_buf, const char* dom_current_buf)
{ {
const char *ptr = meminfo_buf; const char *ptr = meminfo_buf;
static char outbuf[4096]; static char outbuf[4096];
int val; long long val;
int len; int len;
int ret; int ret;
int MemTotal = 0, MemFree = 0, Buffers = 0, Cached = 0, SwapTotal = long long MemTotal = 0, MemFree = 0, Buffers = 0, Cached = 0, SwapTotal =
0, SwapFree = 0; 0, SwapFree = 0;
unsigned long long key; unsigned long long key;
long used_mem, used_mem_diff; long long used_mem, used_mem_diff;
int nitems = 0; int nitems = 0;
while (nitems != (1<<6)-1 || !*ptr) { while (nitems != (1<<6)-1 || !*ptr) {
ret = sscanf(ptr, "%*s %d kB\n%n", &val, &len); ret = sscanf(ptr, "%*s %lld kB\n%n", &val, &len);
if (ret < 1 || len < (int)sizeof (unsigned long long)) { if (ret < 1 || len < (int)sizeof (unsigned long long)) {
ptr += len; ptr += len;
continue; continue;
@ -60,7 +60,7 @@ const char *parse(const char *meminfo_buf, const char* dom_current_buf)
} }
if(dom_current_buf) { if(dom_current_buf) {
int DomTotal = strtol(dom_current_buf, 0, 10); long long DomTotal = strtoll(dom_current_buf, 0, 10);
if(DomTotal) if(DomTotal)
MemTotal = DomTotal; MemTotal = DomTotal;
} }
@ -79,8 +79,8 @@ const char *parse(const char *meminfo_buf, const char* dom_current_buf)
&& used_mem_diff > used_mem_change_threshold/2)) { && used_mem_diff > used_mem_change_threshold/2)) {
prev_used_mem = used_mem; prev_used_mem = used_mem;
sprintf(outbuf, sprintf(outbuf,
"MemTotal: %d kB\nMemFree: %d kB\nBuffers: %d kB\nCached: %d kB\n" "MemTotal: %lld kB\nMemFree: %lld kB\nBuffers: %lld kB\nCached: %lld kB\n"
"SwapTotal: %d kB\nSwapFree: %d kB\n", MemTotal, "SwapTotal: %lld kB\nSwapFree: %lld kB\n", MemTotal,
MemFree, Buffers, Cached, SwapTotal, SwapFree); MemFree, Buffers, Cached, SwapTotal, SwapFree);
return outbuf; return outbuf;
} }