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.

Sign up for GitHub

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

Simplify printing of memory values for more intuitive comprehension #1575

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Simplify printing of memory values for more intuitive comprehension #1575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 5 additions & 30 deletions Row.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,23 +212,14 @@ void Row_printKBytes(RichString* str, unsigned long long number, bool coloring)
nextUnitColor = colors[1];
}

if (number < 1000) {
// Plain number, no markings
len = xSnprintf(buffer, sizeof(buffer), "%5u ", (unsigned int)number);
RichString_appendnAscii(str, color, buffer, len);
return;
}

if (number < 100000) {
// 2 digits for M, 3 digits for K
len = xSnprintf(buffer, sizeof(buffer), "%2u", (unsigned int)(number / 1000));
RichString_appendnAscii(str, nextUnitColor, buffer, len);
len = xSnprintf(buffer, sizeof(buffer), "%03u ", (unsigned int)(number % 1000));
if (number < ONE_K) {
// Below one MiB
len = xSnprintf(buffer, sizeof(buffer), "%4uK ", (unsigned int)number);
RichString_appendnAscii(str, color, buffer, len);
return;
}

// 100000 KiB (97.6 MiB) or greater. A unit prefix would be added.
// Add unit prefix.
const size_t maxUnitIndex = (sizeof(number) * CHAR_BIT - 1) / 10 + 1;
const bool canOverflow = maxUnitIndex >= ARRAYSIZE(unitPrefixes);

Expand All @@ -255,23 +246,7 @@ void Row_printKBytes(RichString* str, unsigned long long number, bool coloring)

number = hundredths / 100;
hundredths %= 100;
if (number < 100) {
if (number < 10) {
// 1 digit + decimal point + 2 digits
// "9.76G", "9.99G", "9.76T", "9.99T", etc.
len = xSnprintf(buffer, sizeof(buffer), "%1u", (unsigned int)number);
RichString_appendnAscii(str, color, buffer, len);
len = xSnprintf(buffer, sizeof(buffer), ".%02u", (unsigned int)hundredths);
} else {
// 2 digits + decimal point + 1 digit
// "97.6M", "99.9M", "10.0G", "99.9G", etc.
len = xSnprintf(buffer, sizeof(buffer), "%2u", (unsigned int)number);
RichString_appendnAscii(str, color, buffer, len);
len = xSnprintf(buffer, sizeof(buffer), ".%1u", (unsigned int)hundredths / 10);
}
RichString_appendnAscii(str, prevUnitColor, buffer, len);
len = xSnprintf(buffer, sizeof(buffer), "%c ", unitPrefixes[i]);
} else if (number < 1000) {
if (number < 1000) {
// 3 digits
// "100M", "999M", "100G", "999G", etc.
len = xSnprintf(buffer, sizeof(buffer), "%4u%c ", (unsigned int)number, unitPrefixes[i]);
Expand Down