mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

dboxinfo: avoid unnecessary 64bit math

Browse Source 
The kernel uses 'unsigned long' for those values anyway,
so there is no need for 'long long' in userspace.
This commit is contained in:
Stefan Seyfried
2014-01-05 19:01:59 +01:00
parent 5d157456ed
commit 77c07386e6
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/dboxinfo.cpp
View File

@@ -230,15 +230,14 @@ void CDBoxInfoWidget::paint()
#define MEMINFO_RAM 0 #define MEMINFO_RAM 0
#define MEMINFO_SWAP 1 #define MEMINFO_SWAP 1
#define MEMINFO_ROWS 2 #define MEMINFO_ROWS 2
unsigned long long memstat[MEMINFO_ROWS][MEMINFO_COLUMNS] = { { 0, 0, 0 }, { 0, 0, 0 } }; // total, used, free unsigned long memstat[MEMINFO_ROWS][MEMINFO_COLUMNS] = { { 0, 0, 0 }, { 0, 0, 0 } }; // total, used, free
const char *memtype[MEMINFO_ROWS] = { "RAM", "Swap" }; const char *memtype[MEMINFO_ROWS] = { "RAM", "Swap" };
FILE *procmeminfo = fopen("/proc/meminfo", "r"); FILE *procmeminfo = fopen("/proc/meminfo", "r");
if (procmeminfo) { if (procmeminfo) {
char buf[80], a[80]; char buf[80], a[80];
long long unsigned v; unsigned long v;
while (fgets(buf, sizeof(buf), procmeminfo)) { while (fgets(buf, sizeof(buf), procmeminfo)) {
if (2 == sscanf(buf, "%[^:]: %llu", a, &v)) { if (2 == sscanf(buf, "%[^:]: %lu", a, &v)) {
v <<= 10;
if (!strcasecmp(a, "MemTotal")) if (!strcasecmp(a, "MemTotal"))
memstat[MEMINFO_RAM][MEMINFO_TOTAL] += v; memstat[MEMINFO_RAM][MEMINFO_TOTAL] += v;
else if (!strcasecmp(a, "MemFree")) else if (!strcasecmp(a, "MemFree"))
@@ -468,13 +467,13 @@ void CDBoxInfoWidget::paint()
tmp = memtype[row]; tmp = memtype[row];
break; break;
case 1: case 1:
tmp = bytes2string(memstat[row][MEMINFO_TOTAL]); tmp = bytes2string(memstat[row][MEMINFO_TOTAL] << 10);
break; break;
case 2: case 2:
tmp = bytes2string(memstat[row][MEMINFO_USED]); tmp = bytes2string(memstat[row][MEMINFO_USED] << 10);
break; break;
case 3: case 3:
tmp = bytes2string(memstat[row][MEMINFO_FREE]); tmp = bytes2string(memstat[row][MEMINFO_FREE] << 10);
break; break;
case 4: case 4:
tmp = to_string(memstat[row][MEMINFO_TOTAL] ? (memstat[row][MEMINFO_USED] * 100) / memstat[row][MEMINFO_TOTAL] : 0) + "%"; tmp = to_string(memstat[row][MEMINFO_TOTAL] ? (memstat[row][MEMINFO_USED] * 100) / memstat[row][MEMINFO_TOTAL] : 0) + "%";