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

timer.cpp: fix format specifiers and type confusion

Browse source 
I think the auto-all-the-things here was a making this a little
hard to follow, so replace these things that will be used in printf
with what they really are. And change the * lengths to ints.

should clear up the alerts.
This commit is contained in:
Aaron Gyes 2021-12-02 05:26:06 -08:00
parent 2b736d023f
commit 9b9e2f9f87
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/timer.cpp
View file

@ -157,30 +157,31 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
auto wall_unit = get_unit(net_wall_micros); auto wall_unit = get_unit(net_wall_micros);
auto cpu_unit = get_unit(std::max(net_sys_micros, net_usr_micros)); auto cpu_unit = get_unit(std::max(net_sys_micros, net_usr_micros));
auto wall_time = convert(net_wall_micros, wall_unit); double wall_time = convert(net_wall_micros, wall_unit);
auto usr_time = convert(net_usr_micros, cpu_unit); double usr_time = convert(net_usr_micros, cpu_unit);
auto sys_time = convert(net_sys_micros, cpu_unit); double sys_time = convert(net_sys_micros, cpu_unit);
wcstring output; wcstring output;
if (!verbose) { if (!verbose) {
append_format(output, append_format(output, L"\n_______________________________"
L"\n_______________________________"
L"\nExecuted in %6.2F %s" L"\nExecuted in %6.2F %s"
L"\n usr time %6.2F %s" L"\n usr time %6.2F %s"
L"\n sys time %6.2F %s" L"\n sys time %6.2F %s"
L"\n", L"\n",
wall_time, unit_name(wall_unit), usr_time, unit_name(cpu_unit), sys_time, wall_time, unit_name(wall_unit),
unit_name(cpu_unit)); usr_time, unit_name(cpu_unit),
sys_time, unit_name(cpu_unit));
} else { } else {
auto fish_unit = get_unit(std::max(fish_sys_micros, fish_usr_micros)); auto fish_unit = get_unit(std::max(fish_sys_micros, fish_usr_micros));
auto child_unit = get_unit(std::max(child_sys_micros, child_usr_micros)); auto child_unit = get_unit(std::max(child_sys_micros, child_usr_micros));
auto fish_usr_time = convert(fish_usr_micros, fish_unit); double fish_usr_time = convert(fish_usr_micros, fish_unit);
auto fish_sys_time = convert(fish_sys_micros, fish_unit); double fish_sys_time = convert(fish_sys_micros, fish_unit);
auto child_usr_time = convert(child_usr_micros, child_unit); double child_usr_time = convert(child_usr_micros, child_unit);
auto child_sys_time = convert(child_sys_micros, child_unit); double child_sys_time = convert(child_sys_micros, child_unit);
auto column2_unit_len = int column2_unit_len = std::max(strlen(unit_short_name(wall_unit)),
std::max(strlen(unit_short_name(wall_unit)), strlen(unit_short_name(cpu_unit))); strlen(unit_short_name(cpu_unit)));
// TODO: improve layout and use standard two char units
append_format(output, append_format(output,
L"\n________________________________________________________" L"\n________________________________________________________"
L"\nExecuted in %6.2F %-*s %-*s %s" L"\nExecuted in %6.2F %-*s %-*s %s"
@ -188,13 +189,12 @@ wcstring timer_snapshot_t::print_delta(const timer_snapshot_t &t1, const timer_s
L"\n sys time %6.2F %-*s %6.2F %s %6.2F %s" L"\n sys time %6.2F %-*s %6.2F %s %6.2F %s"
L"\n", L"\n",
wall_time, column2_unit_len, unit_short_name(wall_unit), wall_time, column2_unit_len, unit_short_name(wall_unit),
strlen(unit_short_name(fish_unit)) + 7, "fish", "external", // static_cast<int>(strlen(unit_short_name(fish_unit))) + 7, "fish", "external",
usr_time, column2_unit_len, unit_short_name(cpu_unit), fish_usr_time, // usr_time, column2_unit_len, unit_short_name(cpu_unit), fish_usr_time,
unit_short_name(fish_unit), child_usr_time, unit_short_name(child_unit), unit_short_name(fish_unit), child_usr_time, unit_short_name(child_unit),
sys_time, column2_unit_len, unit_short_name(cpu_unit), fish_sys_time, sys_time, column2_unit_len, unit_short_name(cpu_unit), fish_sys_time,
unit_short_name(fish_unit), child_sys_time, unit_short_name(child_unit)); unit_short_name(fish_unit), child_sys_time, unit_short_name(child_unit));
} }
return output; return output;
}; };