Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

memory: enable decimals with percentage #537

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/print_mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ static int print_bytes_human(char *outwalk, unsigned long bytes, const char *uni
return sprintf(outwalk, "%.*f %s", prec, base, iec_symbols[exponent]);
}

static int print_percentage(char *outwalk, float percent) {
return snprintf(outwalk, STRING_SIZE, "%.1f%s", percent, pct_mark);
static int print_percentage(char *outwalk, float percent, const int decimals) {
const int prec = decimals > MAX_DECIMALS ? MAX_DECIMALS : decimals;
return snprintf(outwalk, STRING_SIZE, "%.*f%s", prec, percent, pct_mark);
}
#endif

Expand Down Expand Up @@ -184,10 +185,10 @@ void print_memory(memory_ctx_t *ctx) {
print_bytes_human(string_ram_free, ram_free, ctx->unit, ctx->decimals);
print_bytes_human(string_ram_available, ram_available, ctx->unit, ctx->decimals);
print_bytes_human(string_ram_shared, ram_shared, ctx->unit, ctx->decimals);
print_percentage(string_percentage_free, 100.0 * ram_free / ram_total);
print_percentage(string_percentage_available, 100.0 * ram_available / ram_total);
print_percentage(string_percentage_used, 100.0 * ram_used / ram_total);
print_percentage(string_percentage_shared, 100.0 * ram_shared / ram_total);
print_percentage(string_percentage_free, 100.0 * ram_free / ram_total, ctx->decimals);
print_percentage(string_percentage_available, 100.0 * ram_available / ram_total, ctx->decimals);
print_percentage(string_percentage_used, 100.0 * ram_used / ram_total, ctx->decimals);
print_percentage(string_percentage_shared, 100.0 * ram_shared / ram_total, ctx->decimals);

placeholder_t placeholders[] = {
{.name = "%total", .value = string_ram_total},
Expand Down