Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-19 08:24:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add comment about rounding in timer and appease clang-format

Browse source
This commit is contained in:
Johannes Altmanninger 2020-03-14 13:34:31 +01:00
parent f864bd83ad
commit 3816c4bb39
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/fish_tests.cpp
View file

@ -5662,10 +5662,10 @@ ________________________________________________________
Executed in 500.00 micros fish external Executed in 500.00 micros fish external
usr time 1.00 secs 1.00 secs 1.00 millis usr time 1.00 secs 1.00 secs 1.00 millis
sys time 1.00 secs 1.00 secs 0.50 millis sys time 1.00 secs 1.00 secs 0.50 millis
)"; // (a) (b) (c) )"; // (a) (b) (c)
// (a) remaining columns should align even if there are different units // (a) remaining columns should align even if there are different units
// (b) carry to the next unit when it would overflow %6.2F // (b) carry to the next unit when it would overflow %6.2F
// (c) carry to the next unit when the larger one exceeds 1000 // (c) carry to the next unit when the larger one exceeds 1000
std::wstring actual = timer_snapshot_t::print_delta(t1, t2, true); std::wstring actual = timer_snapshot_t::print_delta(t1, t2, true);
if (actual != expected) { if (actual != expected) {
err(L"Failed to format timer snapshot\n\Expected: %ls\nActual:%ls\n", expected, err(L"Failed to format timer snapshot\n\Expected: %ls\nActual:%ls\n", expected,

2
src/timer.cpp
View file

@ -101,7 +101,7 @@ wcstring timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2,
auto get_unit = [](int64_t micros) { auto get_unit = [](int64_t micros) {
if (micros > 900 * 1E6) { if (micros > 900 * 1E6) {
return tunit::minutes; return tunit::minutes;
} else if (micros >= 999995) { } else if (micros >= 999995) { // Move to seconds if we would overflow the %6.2 format.
return tunit::seconds; return tunit::seconds;
} else if (micros >= 1000) { } else if (micros >= 1000) {
return tunit::milliseconds; return tunit::milliseconds;