mirror of
https://github.com/sharkdp/hyperfine.git
synced 2026-11-01 08:50:19 +00:00
Remove BenchmarkResult::new
This commit is contained in:
David Peter authored and David Peter committed
1 parent
4fa0aba266
commit
81b737fdc1
5 files changed
+201
-243
No files matched your search
+13
-12
@@ -503,20 +503,21 @@ pub fn run_benchmark(
|
||||
});
|
||||
run_cleanup_command(&options.shell, &cleanup_cmd, options.show_output)?;
|
||||
|
||||
Ok(BenchmarkResult::new(
|
||||
command_name,
|
||||
t_mean,
|
||||
t_stddev,
|
||||
t_median,
|
||||
user_mean,
|
||||
system_mean,
|
||||
t_min,
|
||||
t_max,
|
||||
times_real,
|
||||
Ok(BenchmarkResult {
|
||||
command: command_name,
|
||||
mean: t_mean,
|
||||
stddev: t_stddev,
|
||||
median: t_median,
|
||||
user: user_mean,
|
||||
system: system_mean,
|
||||
min: t_min,
|
||||
max: t_max,
|
||||
times: Some(times_real),
|
||||
exit_codes,
|
||||
cmd.get_parameters()
|
||||
parameters: cmd
|
||||
.get_parameters()
|
||||
.iter()
|
||||
.map(|(name, value)| ((*name).to_string(), value.to_string()))
|
||||
.collect(),
|
||||
))
|
||||
})
|
||||
}
|
||||
@@ -44,35 +44,3 @@ pub struct BenchmarkResult {
|
||||
#[serde(skip_serializing_if = "BTreeMap::is_empty")]
|
||||
pub parameters: BTreeMap<String, String>,
|
||||
}
|
||||
|
||||
impl BenchmarkResult {
|
||||
/// Create a new entry with the given values.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub fn new(
|
||||
command: String,
|
||||
mean: Second,
|
||||
stddev: Option<Second>,
|
||||
median: Second,
|
||||
user: Second,
|
||||
system: Second,
|
||||
min: Second,
|
||||
max: Second,
|
||||
times: Vec<Second>,
|
||||
exit_codes: Vec<Option<i32>>,
|
||||
parameters: BTreeMap<String, String>,
|
||||
) -> Self {
|
||||
BenchmarkResult {
|
||||
command,
|
||||
mean,
|
||||
stddev,
|
||||
median,
|
||||
user,
|
||||
system,
|
||||
min,
|
||||
max,
|
||||
times: Some(times),
|
||||
exit_codes,
|
||||
parameters,
|
||||
}
|
||||
}
|
||||
}
|
||||
+58
-68
@@ -119,27 +119,22 @@ fn test_asciidoc_table_row() {
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
let timing_result = BenchmarkResultWithRelativeSpeed {
|
||||
result: &BenchmarkResult::new(
|
||||
String::from("sleep 1"), // command
|
||||
0.10491992406666667, // mean
|
||||
Some(0.00397851689425097), // stddev
|
||||
0.10491992406666667, // median
|
||||
0.005182013333333333, // user
|
||||
0.0, // system
|
||||
0.1003342584, // min
|
||||
0.10745223440000001, // max
|
||||
vec![
|
||||
// times
|
||||
0.1003342584,
|
||||
0.10745223440000001,
|
||||
0.10697327940000001,
|
||||
],
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // param
|
||||
),
|
||||
relative_speed: 1.000, // relative_speed
|
||||
relative_speed_stddev: Option::from(1.03), // relative_speed_stddev
|
||||
is_fastest: true, // is_fastest
|
||||
result: &BenchmarkResult {
|
||||
command: String::from("sleep 1"),
|
||||
mean: 0.10491992406666667,
|
||||
stddev: Some(0.00397851689425097),
|
||||
median: 0.10491992406666667,
|
||||
user: 0.005182013333333333,
|
||||
system: 0.0,
|
||||
min: 0.1003342584,
|
||||
max: 0.10745223440000001,
|
||||
times: Some(vec![0.1003342584, 0.10745223440000001, 0.10697327940000001]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
relative_speed: 1.000,
|
||||
relative_speed_stddev: Option::from(1.03),
|
||||
is_fastest: true,
|
||||
};
|
||||
|
||||
let formatted = String::from_utf8(table_row(&timing_result, Unit::MilliSecond)).unwrap();
|
||||
@@ -167,27 +162,22 @@ fn test_asciidoc_table_row() {
|
||||
fn test_asciidoc_table_row_command_escape() {
|
||||
use std::collections::BTreeMap;
|
||||
let benchmark_result = BenchmarkResultWithRelativeSpeed {
|
||||
result: &BenchmarkResult::new(
|
||||
String::from("sleep 1|"), // command
|
||||
0.10491992406666667, // mean
|
||||
Some(0.00397851689425097), // stddev
|
||||
0.10491992406666667, // median
|
||||
0.005182013333333333, // user
|
||||
0.0, // system
|
||||
0.1003342584, // min
|
||||
0.10745223440000001, // max
|
||||
vec![
|
||||
// times
|
||||
0.1003342584,
|
||||
0.10745223440000001,
|
||||
0.10697327940000001,
|
||||
],
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // param
|
||||
),
|
||||
relative_speed: 1.000, // relative_speed
|
||||
relative_speed_stddev: Option::from(1.03), // relative_speed_stddev
|
||||
is_fastest: true, // is_fastest
|
||||
result: &BenchmarkResult {
|
||||
command: String::from("sleep 1|"),
|
||||
mean: 0.10491992406666667,
|
||||
stddev: Some(0.00397851689425097),
|
||||
median: 0.10491992406666667,
|
||||
user: 0.005182013333333333,
|
||||
system: 0.0,
|
||||
min: 0.1003342584,
|
||||
max: 0.10745223440000001,
|
||||
times: Some(vec![0.1003342584, 0.10745223440000001, 0.10697327940000001]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
relative_speed: 1.000,
|
||||
relative_speed_stddev: Option::from(1.03),
|
||||
is_fastest: true,
|
||||
};
|
||||
let expected = String::from_utf8(
|
||||
format!(
|
||||
@@ -216,42 +206,42 @@ fn test_asciidoc() {
|
||||
let exporter = AsciidocExporter::default();
|
||||
// NOTE: results are fabricated, unlike above
|
||||
let results = vec![
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=1 BAR=2 command | 1"),
|
||||
1.0,
|
||||
Some(2.0),
|
||||
1.0,
|
||||
3.0,
|
||||
4.0,
|
||||
5.0,
|
||||
6.0,
|
||||
vec![7.0, 8.0, 9.0],
|
||||
vec![Some(0), Some(0), Some(0)],
|
||||
{
|
||||
BenchmarkResult {
|
||||
command: String::from("FOO=1 BAR=2 command | 1"),
|
||||
mean: 1.0,
|
||||
stddev: Some(2.0),
|
||||
median: 1.0,
|
||||
user: 3.0,
|
||||
system: 4.0,
|
||||
min: 5.0,
|
||||
max: 6.0,
|
||||
times: Some(vec![7.0, 8.0, 9.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: {
|
||||
let mut params = BTreeMap::new();
|
||||
params.insert("foo".into(), "1".into());
|
||||
params.insert("bar".into(), "2".into());
|
||||
params
|
||||
},
|
||||
),
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=1 BAR=7 command | 2"),
|
||||
11.0,
|
||||
Some(12.0),
|
||||
11.0,
|
||||
13.0,
|
||||
14.0,
|
||||
15.0,
|
||||
16.0,
|
||||
vec![17.0, 18.0, 19.0],
|
||||
vec![Some(0), Some(0), Some(0)],
|
||||
{
|
||||
},
|
||||
BenchmarkResult {
|
||||
command: String::from("FOO=1 BAR=7 command | 2"),
|
||||
mean: 11.0,
|
||||
stddev: Some(12.0),
|
||||
median: 11.0,
|
||||
user: 13.0,
|
||||
system: 14.0,
|
||||
min: 15.0,
|
||||
max: 16.0,
|
||||
times: Some(vec![17.0, 18.0, 19.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: {
|
||||
let mut params = BTreeMap::new();
|
||||
params.insert("foo".into(), "1".into());
|
||||
params.insert("bar".into(), "7".into());
|
||||
params
|
||||
},
|
||||
),
|
||||
},
|
||||
];
|
||||
// NOTE: only testing with s, s/ms is tested elsewhere
|
||||
let expected: String = String::from(
|
||||
|
||||
+26
-27
@@ -60,44 +60,43 @@ fn test_csv() {
|
||||
use std::collections::BTreeMap;
|
||||
let exporter = CsvExporter::default();
|
||||
|
||||
// NOTE: results are fabricated
|
||||
let results = vec![
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=one BAR=two command | 1"),
|
||||
1.0,
|
||||
Some(2.0),
|
||||
1.0,
|
||||
3.0,
|
||||
4.0,
|
||||
5.0,
|
||||
6.0,
|
||||
vec![7.0, 8.0, 9.0],
|
||||
vec![Some(0), Some(0), Some(0)],
|
||||
{
|
||||
BenchmarkResult {
|
||||
command: String::from("FOO=one BAR=two command | 1"),
|
||||
mean: 1.0,
|
||||
stddev: Some(2.0),
|
||||
median: 1.0,
|
||||
user: 3.0,
|
||||
system: 4.0,
|
||||
min: 5.0,
|
||||
max: 6.0,
|
||||
times: Some(vec![7.0, 8.0, 9.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: {
|
||||
let mut params = BTreeMap::new();
|
||||
params.insert("foo".into(), "one".into());
|
||||
params.insert("bar".into(), "two".into());
|
||||
params
|
||||
},
|
||||
),
|
||||
BenchmarkResult::new(
|
||||
String::from("FOO=one BAR=seven command | 2"),
|
||||
11.0,
|
||||
Some(12.0),
|
||||
11.0,
|
||||
13.0,
|
||||
14.0,
|
||||
15.0,
|
||||
16.5,
|
||||
vec![17.0, 18.0, 19.0],
|
||||
vec![Some(0), Some(0), Some(0)],
|
||||
{
|
||||
},
|
||||
BenchmarkResult {
|
||||
command: String::from("FOO=one BAR=seven command | 2"),
|
||||
mean: 11.0,
|
||||
stddev: Some(12.0),
|
||||
median: 11.0,
|
||||
user: 13.0,
|
||||
system: 14.0,
|
||||
min: 15.0,
|
||||
max: 16.5,
|
||||
times: Some(vec![17.0, 18.0, 19.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: {
|
||||
let mut params = BTreeMap::new();
|
||||
params.insert("foo".into(), "one".into());
|
||||
params.insert("bar".into(), "seven".into());
|
||||
params
|
||||
},
|
||||
),
|
||||
},
|
||||
];
|
||||
let exps: String = String::from(
|
||||
"command,mean,stddev,median,user,system,min,max,parameter_bar,parameter_foo\n\
|
||||
|
||||
+104
-104
@@ -96,32 +96,32 @@ fn test_markdown_format_ms() {
|
||||
let exporter = MarkdownExporter::default();
|
||||
|
||||
let timing_results = vec![
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
0.1023, // min
|
||||
0.1080, // max
|
||||
vec![0.1, 0.1, 0.1], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
2.0020, // min
|
||||
2.0080, // max
|
||||
vec![2.0, 2.0, 2.0], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 0.1"),
|
||||
mean: 0.1057,
|
||||
stddev: Some(0.0016),
|
||||
median: 0.1057,
|
||||
user: 0.0009,
|
||||
system: 0.0011,
|
||||
min: 0.1023,
|
||||
max: 0.1080,
|
||||
times: Some(vec![0.1, 0.1, 0.1]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 2"),
|
||||
mean: 2.0050,
|
||||
stddev: Some(0.0020),
|
||||
median: 2.0050,
|
||||
user: 0.0009,
|
||||
system: 0.0012,
|
||||
min: 2.0020,
|
||||
max: 2.0080,
|
||||
times: Some(vec![2.0, 2.0, 2.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
];
|
||||
|
||||
let formatted = String::from_utf8(exporter.serialize(&timing_results, None).unwrap()).unwrap();
|
||||
@@ -145,32 +145,32 @@ fn test_markdown_format_s() {
|
||||
let exporter = MarkdownExporter::default();
|
||||
|
||||
let timing_results = vec![
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
2.0020, // min
|
||||
2.0080, // max
|
||||
vec![2.0, 2.0, 2.0], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
0.1023, // min
|
||||
0.1080, // max
|
||||
vec![0.1, 0.1, 0.1], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 2"),
|
||||
mean: 2.0050,
|
||||
stddev: Some(0.0020),
|
||||
median: 2.0050,
|
||||
user: 0.0009,
|
||||
system: 0.0012,
|
||||
min: 2.0020,
|
||||
max: 2.0080,
|
||||
times: Some(vec![2.0, 2.0, 2.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 0.1"),
|
||||
mean: 0.1057,
|
||||
stddev: Some(0.0016),
|
||||
median: 0.1057,
|
||||
user: 0.0009,
|
||||
system: 0.0011,
|
||||
min: 0.1023,
|
||||
max: 0.1080,
|
||||
times: Some(vec![0.1, 0.1, 0.1]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
];
|
||||
|
||||
let formatted = String::from_utf8(exporter.serialize(&timing_results, None).unwrap()).unwrap();
|
||||
@@ -193,32 +193,32 @@ fn test_markdown_format_time_unit_s() {
|
||||
let exporter = MarkdownExporter::default();
|
||||
|
||||
let timing_results = vec![
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
0.1023, // min
|
||||
0.1080, // max
|
||||
vec![0.1, 0.1, 0.1], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
2.0020, // min
|
||||
2.0080, // max
|
||||
vec![2.0, 2.0, 2.0], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 0.1"),
|
||||
mean: 0.1057,
|
||||
stddev: Some(0.0016),
|
||||
median: 0.1057,
|
||||
user: 0.0009,
|
||||
system: 0.0011,
|
||||
min: 0.1023,
|
||||
max: 0.1080,
|
||||
times: Some(vec![0.1, 0.1, 0.1]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 2"),
|
||||
mean: 2.0050,
|
||||
stddev: Some(0.0020),
|
||||
median: 2.0050,
|
||||
user: 0.0009,
|
||||
system: 0.0012,
|
||||
min: 2.0020,
|
||||
max: 2.0080,
|
||||
times: Some(vec![2.0, 2.0, 2.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
];
|
||||
|
||||
let formatted = String::from_utf8(
|
||||
@@ -247,32 +247,32 @@ fn test_markdown_format_time_unit_ms() {
|
||||
let exporter = MarkdownExporter::default();
|
||||
|
||||
let timing_results = vec![
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 2"),
|
||||
2.0050, // mean
|
||||
Some(0.0020), // std dev
|
||||
2.0050, // median
|
||||
0.0009, // user_mean
|
||||
0.0012, // system_mean
|
||||
2.0020, // min
|
||||
2.0080, // max
|
||||
vec![2.0, 2.0, 2.0], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult::new(
|
||||
String::from("sleep 0.1"),
|
||||
0.1057, // mean
|
||||
Some(0.0016), // std dev
|
||||
0.1057, // median
|
||||
0.0009, // user_mean
|
||||
0.0011, // system_mean
|
||||
0.1023, // min
|
||||
0.1080, // max
|
||||
vec![0.1, 0.1, 0.1], // times
|
||||
vec![Some(0), Some(0), Some(0)], // exit codes
|
||||
BTreeMap::new(), // parameter
|
||||
),
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 2"),
|
||||
mean: 2.0050,
|
||||
stddev: Some(0.0020),
|
||||
median: 2.0050,
|
||||
user: 0.0009,
|
||||
system: 0.0012,
|
||||
min: 2.0020,
|
||||
max: 2.0080,
|
||||
times: Some(vec![2.0, 2.0, 2.0]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
BenchmarkResult {
|
||||
command: String::from("sleep 0.1"),
|
||||
mean: 0.1057,
|
||||
stddev: Some(0.0016),
|
||||
median: 0.1057,
|
||||
user: 0.0009,
|
||||
system: 0.0011,
|
||||
min: 0.1023,
|
||||
max: 0.1080,
|
||||
times: Some(vec![0.1, 0.1, 0.1]),
|
||||
exit_codes: vec![Some(0), Some(0), Some(0)],
|
||||
parameters: BTreeMap::new(),
|
||||
},
|
||||
];
|
||||
|
||||
let formatted = String::from_utf8(
|
||||
|
||||
Reference in new issue
Block a user