Skip to content

fix: correct units for bytes in HumanStatistics #896

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

Open
jodavies wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: correct units for bytes in HumanStatistics #896

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions check/features.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2395,13 +2395,13 @@ Local test3 = (1+x)^1000;
assert succeeded?
assert stdout =~ exact_pattern("Generated terms = 500 ( <1 K )")
assert stdout =~ exact_pattern("Terms in output = 500 ( <1 K )")
assert stdout =~ exact_pattern("Bytes used = 54420 ( 54 KiB)")
assert stdout =~ exact_pattern("Bytes used = 54420 ( 53 KiB)")
assert stdout =~ exact_pattern("Generated terms = 501 ( 1 K )")
assert stdout =~ exact_pattern("Terms in output = 501 ( 1 K )")
assert stdout =~ exact_pattern("Bytes used = 54644 ( 55 KiB)")
assert stdout =~ exact_pattern("Bytes used = 54644 ( 53 KiB)")
assert stdout =~ exact_pattern("Generated terms = 1001 ( 1 K )")
assert stdout =~ exact_pattern("Terms in output = 1001 ( 1 K )")
assert stdout =~ exact_pattern("Bytes used = 199172 (199 KiB)")
assert stdout =~ exact_pattern("Bytes used = 199172 (195 KiB)")
*--#] humanstats :
*--#[ ModuleOption_dollar_order :
$a = 0;
Expand Down
20 changes: 11 additions & 9 deletions sources/sort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,12 @@ char *toterms[] = { " ", " >>", "-->" };
#define HUMANSUFFSTRLEN 4
const char humanTermsSuffix[HUMANSUFFLEN][HUMANSUFFSTRLEN] = {"K ","M ","B ","T "};
const char humanBytesSuffix[HUMANSUFFLEN][HUMANSUFFSTRLEN] = {"KiB","MiB","GiB","TiB"};
void HumanString(char* string, float input, const char suffix[HUMANSUFFLEN][HUMANSUFFSTRLEN]) {
void HumanString(char* string, float input, const float scale,
const char suffix[HUMANSUFFLEN][HUMANSUFFSTRLEN]) {

int ind = -1;
while (ind < 0 || (input >= 1000.0f && ind+1 < HUMANSUFFLEN) ) {
input /= 1000.0f;
while (ind < 0 || (input >= scale && ind+1 < HUMANSUFFLEN) ) {
input /= scale;
ind++;
}
if ( input <= 0.5f ) {
Expand Down Expand Up @@ -167,12 +169,12 @@ void WriteStats(POSITION *plspace, WORD par, WORD checkLogType)
char humanComparisonsText[HUMANSTRLEN] = "";
char humanMaxTermSizeText[HUMANSTRLEN] = "";
if ( AC.HumanStatsFlag ) {
HumanString(humanGenTermsText, (float)(S->GenTerms), humanTermsSuffix);
HumanString(humanTermsLeftText, (float)(S->TermsLeft), humanTermsSuffix);
HumanString(humanBytesText, (float)(BASEPOSITION(*plspace)), humanBytesSuffix);
HumanString(humanUnsortedBytesText, (float)(S->verbUnsortedSize), humanBytesSuffix);
HumanString(humanComparisonsText, (float)(S->verbComparisons), humanTermsSuffix);
HumanString(humanMaxTermSizeText, (float)(S->verbMaxTermSize), humanTermsSuffix);
HumanString(humanGenTermsText, (float)(S->GenTerms), 1000.0f, humanTermsSuffix);
HumanString(humanTermsLeftText, (float)(S->TermsLeft), 1000.0f, humanTermsSuffix);
HumanString(humanBytesText, (float)(BASEPOSITION(*plspace)), 1024.0f, humanBytesSuffix);
HumanString(humanUnsortedBytesText, (float)(S->verbUnsortedSize), 1024.0f, humanBytesSuffix);
HumanString(humanComparisonsText, (float)(S->verbComparisons), 1000.0f, humanTermsSuffix);
HumanString(humanMaxTermSizeText, (float)(S->verbMaxTermSize), 1000.0f, humanTermsSuffix);
}

MLOCK(ErrorMessageLock);
Expand Down
Loading