lucic71
/
i3status
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename ram variables consistently

This commit is contained in:
Benedikt Heine 2018-04-16 15:41:13 +02:00 committed by Felix Buehler
parent c55754542e
commit 7839e93c9b
1 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/print_mem.c
View File

@ -11,7 +11,7 @@
#define MAX_EXPONENT 4
static const char *const iec_symbols[MAX_EXPONENT + 1] = {"", "Ki", "Mi", "Gi", "Ti"};
static const char filename[] = "/proc/meminfo";
static const char memoryfile_linux[] = "/proc/meminfo";
/*
* Prints the given amount of bytes in a human readable manner.
@ -32,30 +32,30 @@ static int print_bytes_human(char *outwalk, uint64_t bytes) {
* Determines whether remaining bytes are below given threshold.
*
*/
static bool below_threshold(const long totalRam, const long usedRam, const char *threshold_type, const long low_threshold) {
static bool below_threshold(const long ram_total, const long ram_used, const char *threshold_type, const long low_threshold) {
// empty is available or free, based on "use_available_memory"
long empty = totalRam - usedRam;
long empty = ram_total - ram_used;
if (BEGINS_WITH(threshold_type, "percentage_")) {
return 100.0 * empty / totalRam < low_threshold;
return 100.0 * empty / ram_total < low_threshold;
} else if (strcasecmp(threshold_type, "bytes_free") == 0) {
return empty < low_threshold;
} else if (threshold_type[0] != '\0' && strncasecmp(threshold_type + 1, "bytes_", strlen("bytes_")) == 0) {
uint64_t base = BINARY_BASE;
long factor = 1;
switch (threshold_type[0]) {
case 'T':
case 't':
factor *= base;
factor *= BINARY_BASE;
case 'G':
case 'g':
factor *= base;
factor *= BINARY_BASE;
case 'M':
case 'm':
factor *= base;
factor *= BINARY_BASE;
case 'K':
case 'k':
factor *= base;
factor *= BINARY_BASE;
break;
default:
return false;
@ -73,62 +73,62 @@ void print_memory(yajl_gen json_gen, char *buffer, const char *format, const cha
const char *walk;
bool colorful_output = false;
long totalRam = -1;
long freeRam = -1;
long availableRam = -1;
long usedRam = -1;
long sharedRam = -1;
long cached = -1;
long buffers = -1;
long ram_total = -1;
long ram_free = -1;
long ram_available = -1;
long ram_used = -1;
long ram_shared = -1;
long ram_cached = -1;
long ram_buffers = -1;
FILE *file = fopen(filename, "r");
FILE *file = fopen(memoryfile_linux, "r");
if (!file) {
goto error;
}
char line[128];
while (fgets(line, sizeof line, file)) {
if (BEGINS_WITH(line, "MemTotal:")) {
totalRam = strtol(line + strlen("MemTotal:"), NULL, 10);
ram_total = strtol(line + strlen("MemTotal:"), NULL, 10);
}
if (BEGINS_WITH(line, "MemFree:")) {
freeRam = strtol(line + strlen("MemFree:"), NULL, 10);
ram_free = strtol(line + strlen("MemFree:"), NULL, 10);
}
if (BEGINS_WITH(line, "MemAvailable:")) {
availableRam = strtol(line + strlen("MemAvailable:"), NULL, 10);
ram_available = strtol(line + strlen("MemAvailable:"), NULL, 10);
}
if (BEGINS_WITH(line, "Buffers:")) {
buffers = strtol(line + strlen("Buffers:"), NULL, 10);
ram_buffers = strtol(line + strlen("Buffers:"), NULL, 10);
}
if (BEGINS_WITH(line, "Cached:")) {
cached = strtol(line + strlen("Cached:"), NULL, 10);
ram_cached = strtol(line + strlen("Cached:"), NULL, 10);
}
if (BEGINS_WITH(line, "Shmem:")) {
sharedRam = strtol(line + strlen("Shmem:"), NULL, 10);
ram_shared = strtol(line + strlen("Shmem:"), NULL, 10);
}
if (totalRam != -1 && freeRam != -1 && availableRam != -1 && buffers != -1 && cached != -1 && sharedRam != -1) {
if (ram_total != -1 && ram_free != -1 && ram_available != -1 && ram_buffers != -1 && ram_cached != -1 && ram_shared != -1) {
break;
}
}
fclose(file);
if (totalRam == -1 || freeRam == -1 || availableRam == -1 || buffers == -1 || cached == -1 || sharedRam == -1) {
if (ram_total == -1 || ram_free == -1 || ram_available == -1 || ram_buffers == -1 || ram_cached == -1 || ram_shared == -1) {
goto error;
}
totalRam = totalRam * BINARY_BASE;
freeRam = freeRam * BINARY_BASE;
availableRam = availableRam * BINARY_BASE;
buffers = buffers * BINARY_BASE;
cached = cached * BINARY_BASE;
sharedRam = sharedRam * BINARY_BASE;
ram_total = ram_total * BINARY_BASE;
ram_free = ram_free * BINARY_BASE;
ram_available = ram_available * BINARY_BASE;
ram_buffers = ram_buffers * BINARY_BASE;
ram_cached = ram_cached * BINARY_BASE;
ram_shared = ram_shared * BINARY_BASE;
if (use_available_memory) {
usedRam = totalRam - availableRam;
ram_used = ram_total - ram_available;
} else {
usedRam = totalRam - freeRam - buffers - cached;
ram_used = ram_total - ram_free - ram_buffers - ram_cached;
}
if (degraded_low_threshold > 0 && below_threshold(totalRam, usedRam, degraded_threshold_type, degraded_low_threshold)) {
if (critical_low_threshold > 0 && below_threshold(totalRam, usedRam, critical_threshold_type, critical_low_threshold)) {
if (degraded_low_threshold > 0 && below_threshold(ram_total, ram_used, degraded_threshold_type, degraded_low_threshold)) {
if (critical_low_threshold > 0 && below_threshold(ram_total, ram_used, critical_threshold_type, critical_low_threshold)) {
START_COLOR("color_bad");
colorful_output = true;
if (critical_format_below_threshold != NULL)
@ -147,47 +147,47 @@ void print_memory(yajl_gen json_gen, char *buffer, const char *format, const cha
continue;
}
if (BEGINS_WITH(walk + 1, "total")) {
outwalk += print_bytes_human(outwalk, totalRam);
outwalk += print_bytes_human(outwalk, ram_total);
walk += strlen("total");
}
if (BEGINS_WITH(walk + 1, "used")) {
outwalk += print_bytes_human(outwalk, usedRam);
outwalk += print_bytes_human(outwalk, ram_used);
walk += strlen("used");
}
if (BEGINS_WITH(walk + 1, "free")) {
outwalk += print_bytes_human(outwalk, freeRam);
outwalk += print_bytes_human(outwalk, ram_free);
walk += strlen("free");
}
if (BEGINS_WITH(walk + 1, "available")) {
outwalk += print_bytes_human(outwalk, availableRam);
outwalk += print_bytes_human(outwalk, ram_available);
walk += strlen("available");
}
if (BEGINS_WITH(walk + 1, "shared")) {
outwalk += print_bytes_human(outwalk, sharedRam);
outwalk += print_bytes_human(outwalk, ram_shared);
walk += strlen("shared");
}
if (BEGINS_WITH(walk + 1, "percentage_free")) {
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * freeRam / totalRam, pct_mark);
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_free / ram_total, pct_mark);
walk += strlen("percentage_free");
}
if (BEGINS_WITH(walk + 1, "percentage_available")) {
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * availableRam / totalRam, pct_mark);
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_available / ram_total, pct_mark);
walk += strlen("percentage_available");
}
if (BEGINS_WITH(walk + 1, "percentage_used")) {
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * usedRam / totalRam, pct_mark);
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_used / ram_total, pct_mark);
walk += strlen("percentage_used");
}
if (BEGINS_WITH(walk + 1, "percentage_shared")) {
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * sharedRam / totalRam, pct_mark);
outwalk += sprintf(outwalk, "%.01f%s", 100.0 * ram_shared / ram_total, pct_mark);
walk += strlen("percentage_shared");
}
}
@ -203,6 +203,7 @@ error:
OUTPUT_FULL_TEXT("can't read memory");
fputs("i3status: Cannot read system memory using /proc/meminfo\n", stderr);
#else
OUTPUT_FULL_TEXT("");
fputs("i3status: Memory status information is not supported on this system\n", stderr);
#endif
}