RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 09:37:34 +00:00
Code Issues Activity Actions

Shell: Use new Statistics tool in 'time -n' command

Browse source 
The new Statistics utility is now used when calling 'time -n' to get
some more information of the timings. For now only the standard
deviation is given in addition to the average.

This commit completely undos #9645 because everything that touched moved
into AK::Statistics.
This commit is contained in:
Tobias Christiansen 2021-08-23 23:30:36 +02:00 • committed by Andreas Kling
parent dcf06a4f40
commit 32b4470ea3
1 changed files with 9 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Userland/Shell/Builtin.cpp
View file

@ -9,6 +9,7 @@
#include "Shell/Formatter.h" #include "Shell/Formatter.h"
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/ScopeGuard.h> #include <AK/ScopeGuard.h>
#include <AK/Statistics.h>
#include <AK/String.h> #include <AK/String.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/EventLoop.h> #include <LibCore/EventLoop.h>
@ -898,8 +899,7 @@ int Shell::builtin_time(int argc, const char** argv)
auto commands = expand_aliases({ move(command) }); auto commands = expand_aliases({ move(command) });
Vector<int> iteration_times; AK::Statistics iteration_times;
iteration_times.ensure_capacity(number_of_iterations);
int exit_code = 1; int exit_code = 1;
for (int i = 0; i < number_of_iterations; ++i) { for (int i = 0; i < number_of_iterations; ++i) {
@ -909,25 +909,21 @@ int Shell::builtin_time(int argc, const char** argv)
block_on_job(job); block_on_job(job);
exit_code = job.exit_code(); exit_code = job.exit_code();
} }
iteration_times.unchecked_append(timer.elapsed()); iteration_times.add(timer.elapsed());
} }
if (number_of_iterations == 1) { if (number_of_iterations == 1) {
warnln("Time: {} ms", iteration_times.first()); warnln("Time: {} ms", iteration_times.values().first());
} else { } else {
float total_time = 0; AK::Statistics iteration_times_excluding_first;
for (auto time : iteration_times) for (size_t i = 1; i < iteration_times.size(); i++)
total_time += static_cast<float>(time); iteration_times_excluding_first.add(iteration_times.values()[i]);
float average = total_time / number_of_iterations;
float total_time_excluding_first = total_time - static_cast<float>(iteration_times.first());
float average_excluding_first = total_time_excluding_first / (number_of_iterations - 1);
warnln("Timing report:"); warnln("Timing report:");
warnln("=============="); warnln("==============");
warnln("Command: {}", String::join(' ', args)); warnln("Command: {}", String::join(' ', args));
warnln("Average time: {} ms", average); warnln("Average time: {:.2} ms (median: {}, stddev: {:.2})", iteration_times.average(), iteration_times.median(), iteration_times.standard_deviation());
warnln("Excluding first: {} ms", average_excluding_first); warnln("Excluding first: {:.2} ms (median: {}, stddev: {:.2})", iteration_times_excluding_first.average(), iteration_times_excluding_first.median(), iteration_times_excluding_first.standard_deviation());
} }
return exit_code; return exit_code;