h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-27 12:11:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

timer.cpp: use units like 'ms', etc. vs. "millis"

Browse Source 
Change wording and omit '.00' decimal points in times
This commit is contained in:
Aaron Gyes
2020-02-12 01:37:57 -08:00
parent d659ee336d
commit c01356ddd1
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/timer.cpp
View File

@@ -8,6 +8,7 @@
#include <algorithm>
#include <cerrno>
#include <chrono>
#include <cmath>
#include <cstddef>
#include <ctime>
@@ -128,13 +129,13 @@ wcstring timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2,
auto unit_short_name = [](tunit unit) {
switch (unit) {
case tunit::minutes:
return "mins";
return "min";
case tunit::seconds:
return "secs";
return "sec";
case tunit::milliseconds:
return "millis";
return "ms";
case tunit::microseconds:
return "micros";
return "\u03BCs";
}
// GCC does not recognize the exhaustive switch above
return "";
@@ -152,7 +153,7 @@ wcstring timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2,
return micros / 1.0;
}
// GCC does not recognize the exhaustive switch above
return 0.0;
return std::nan("");
};
auto wall_unit = get_unit(net_wall_micros);
@@ -165,9 +166,9 @@ wcstring timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2,
if (!verbose) {
append_format(output,
L"\n_______________________________"
L"\nExecuted in %6.2F %s"
L"\n usr time %6.2F %s"
L"\n sys time %6.2F %s"
L"\nDuration\t%6.3G %s:"
L"\n user time\t%6.3G %s"
L"\n kernel time\t%6.3G %s"
L"\n",
wall_time, unit_name(wall_unit), usr_time, unit_name(cpu_unit), sys_time,
unit_name(cpu_unit));
@@ -181,9 +182,9 @@ wcstring timer_snapshot_t::print_delta(timer_snapshot_t t1, timer_snapshot_t t2,
append_format(output,
L"\n________________________________________________________"
L"\nExecuted in %6.2F %s %*s %*s "
L"\n usr time %6.2F %s %6.2F %s %6.2F %s "
L"\n sys time %6.2F %s %6.2F %s %6.2F %s "
L"\nDuration %6.3G %s %*s %*s "
L"\n user time %6.3G %s %6.3G %s %6.3G %s "
L"\n kernel time %6.3G %s %6.3G %s %6.3G %s "
L"\n",
wall_time, unit_short_name(wall_unit), strlen(unit_short_name(wall_unit)) - 1,
"fish", strlen(unit_short_name(fish_unit)) - 1, "external", usr_time,