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

Row.c code shrink and adding a new format for Row_printNanoseconds() #1579

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Row.c code shrink and adding a new format for Row_printNanoseconds() #1579

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
21c2c80
Row_printKBytes() code shrink
Explorer09 Jan 1, 2025
16ff93d
Row_printTime() code shrink
Explorer09 Jan 1, 2025
c7b6e4b
Row_printNanoseconds() code shrink
Explorer09 Jan 2, 2025
46e88a9
Add a new printing format to Row_printNanoseconds()
Explorer09 Jan 2, 2025
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
33 changes: 19 additions & 14 deletions Row.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,18 +256,16 @@ void Row_printKBytes(RichString* str, unsigned long long number, bool coloring)
number = hundredths / 100;
hundredths %= 100;
if (number < 100) {
len = xSnprintf(buffer, sizeof(buffer), "%u", (unsigned int)number);
RichString_appendnAscii(str, color, buffer, len);
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);
len = xSnprintf(buffer, sizeof(buffer), ".%u", (unsigned int)hundredths / 10);
}
RichString_appendnAscii(str, prevUnitColor, buffer, len);
len = xSnprintf(buffer, sizeof(buffer), "%c ", unitPrefixes[i]);
Expand All @@ -280,7 +278,7 @@ void Row_printKBytes(RichString* str, unsigned long long number, bool coloring)
// "1000M", "9999M", "1000G", "9999G", etc.
assert(number < 10000);

len = xSnprintf(buffer, sizeof(buffer), "%1u", (unsigned int)number / 1000);
len = xSnprintf(buffer, sizeof(buffer), "%u", (unsigned int)number / 1000);
RichString_appendnAscii(str, nextUnitColor, buffer, len);
len = xSnprintf(buffer, sizeof(buffer), "%03u%c ", (unsigned int)number % 1000, unitPrefixes[i]);
}
Expand Down Expand Up @@ -371,7 +369,7 @@ void Row_printTime(RichString* str, unsigned long long totalHundredths, bool col
unsigned long long totalDays = totalHours / 24;
unsigned int hours = totalHours % 24;
if (totalDays < 10) {
len = xSnprintf(buffer, sizeof(buffer), "%1ud", (unsigned int)totalDays);
len = xSnprintf(buffer, sizeof(buffer), "%ud", (unsigned int)totalDays);
RichString_appendnAscii(str, dayColor, buffer, len);
len = xSnprintf(buffer, sizeof(buffer), "%02uh", hours);
RichString_appendnAscii(str, hourColor, buffer, len);
Expand Down Expand Up @@ -420,23 +418,30 @@ void Row_printNanoseconds(RichString* str, unsigned long long totalNanoseconds,
return;
}

unsigned long long totalMicroseconds = totalNanoseconds / 1000;
if (totalMicroseconds < 1000000) {
len = xSnprintf(buffer, sizeof(buffer), ".%06lus ", (unsigned long)totalMicroseconds);
if (totalNanoseconds < 10000000) {
// The precision is 0.1 microseconds here.
// We print the unit in "ms" rather than microseconds in order
// to save the code of choosing the Greek "mu" or Latin "u".
uint32_t fraction = (uint32_t)totalNanoseconds / 100;
unsigned int milliseconds = (unsigned int)(fraction / 10000);
fraction %= 10000;
len = xSnprintf(buffer, sizeof(buffer), "%u.%04ums ", milliseconds, (unsigned int)fraction);
RichString_appendnAscii(str, baseColor, buffer, len);
return;
}

unsigned long long totalMicroseconds = totalNanoseconds / 1000;
unsigned long long totalSeconds = totalMicroseconds / 1000000;
unsigned long microseconds = totalMicroseconds % 1000000;
if (totalSeconds < 60) {
int width = 5;
unsigned long fraction = microseconds / 10;
if (totalSeconds >= 10) {
int width = 6;
unsigned long fraction = microseconds;
for (unsigned long long limit = 1; totalSeconds >= limit; limit *= 10) {
width--;
fraction /= 10;
}
len = xSnprintf(buffer, sizeof(buffer), "%u.%0*lus ", (unsigned int)totalSeconds, width, fraction);
// "%.u" prints no digits if (totalSeconds == 0).
len = xSnprintf(buffer, sizeof(buffer), "%.u.%0*lus ", (unsigned int)totalSeconds, width, fraction);
RichString_appendnAscii(str, baseColor, buffer, len);
return;
}
Expand Down
Loading