From ceaf50340785957c17c354f43ded0848161bf4c2 Mon Sep 17 00:00:00 2001
From: Keenan Tims <ktims@gotroot.ca>
Date: Wed, 15 Nov 2023 16:05:14 -0800
Subject: [PATCH] Improve bench graph outputs

---
 Cargo.lock      |  4 ++--
 benches/perf.rs | 31 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index be9bcc0..c15043a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -391,9 +391,9 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
 
 [[package]]
 name = "errno"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c18ee0ed65a5f1f81cac6b1d213b69c35fa47d4252ad41f1486dbd8226fe36e"
+checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
 dependencies = [
  "libc",
  "windows-sys 0.48.0",
diff --git a/benches/perf.rs b/benches/perf.rs
index 7cabb58..db73a9c 100644
--- a/benches/perf.rs
+++ b/benches/perf.rs
@@ -6,6 +6,7 @@ use plotters::drawing::IntoDrawingArea;
 use plotters::element::{Circle, EmptyElement, Text};
 use plotters::series::{Histogram, PointSeries};
 use plotters::style::full_palette::{BLUEGREY, GREY};
+use plotters::style::text_anchor::{HPos, Pos, VPos};
 use plotters::style::{Color, IntoFont, RGBAColor, RGBColor, ShapeStyle, BLACK, WHITE};
 use std::ffi::OsStr;
 use std::io::Read;
@@ -74,8 +75,7 @@ fn make_tests(input_path: &str) -> Vec<TestDefinition> {
             name: our_version.into(),
         },
         TestDefinition {
-            cmd: format!("aggregate6 {}", input_path),
-            // cmd: "sleep 0.25".into(),
+            cmd: format!("python3 -m aggregate6 {}", input_path),
             name: format!("{} ({})", agg6_version.trim(), python_version.trim()),
         },
     ]
@@ -112,13 +112,13 @@ where
         .arg("--export-json")
         .arg(resultfile.path())
         .arg("--min-runs")
-        .arg("2")
+        .arg("10")
         .arg("--")
-        .arg(cmd)
+        .arg(&cmd)
         .stdout(Stdio::null())
         .spawn()
         .expect("unable to run command");
-    let rc = process.wait().expect("unable to wait on process");
+    let _rc = process.wait().expect("unable to wait on process");
 
     let mut raw_result_buf = Vec::new();
     resultfile
@@ -127,8 +127,13 @@ where
         .expect("Can't read results");
     resultfile.close().unwrap();
 
-    let hf_result = json::parse(&String::from_utf8_lossy(&raw_result_buf))
-        .expect("Can't parse hyperfine json results");
+    let hf_result = json::parse(&String::from_utf8_lossy(&raw_result_buf)).expect(
+        format!(
+            "Can't parse hyperfine json results from command `{}`",
+            cmd.as_ref().to_string_lossy()
+        )
+        .as_str(),
+    );
 
     let final_result = &hf_result["results"][0];
 
@@ -188,11 +193,19 @@ fn plot_results(
         5,
         ShapeStyle::from(&BLACK).filled(),
         &|coord, size, style| {
+            let (target_y, target_colour) = if coord.1 < 25.0 {
+                (-25, BAR_COLOUR)
+            } else {
+                (25, WHITE)
+            };
             EmptyElement::at(coord.clone())
                 + Text::new(
                     format!("{:.1} x", coord.1),
-                    (0, 10),
-                    ("Roboto", 18).into_font().color(&WHITE),
+                    (0, target_y),
+                    ("Roboto", 18)
+                        .into_font()
+                        .color(&target_colour)
+                        .pos(Pos::new(HPos::Center, VPos::Center)),
                 )
         },
     ))?;