Merge pull request #87 from andjo403/diff_change

add self_time_change to summarize diff

Author: wesleywiser

CHANGELOG.md

@@ -5,6 +5,7 @@
 - `flamegraph`: new tool that uses the `inferno` crate to generate flamegraph svg files ([GH-73])
 - `crox`: Added the `--dir` parameter to merge all events files in dir in to one trace file ([GH-84])
 - `crox`: Added possibility to add multiple `file_prefix` parameters to merge all them to one trace file ([GH-84])
+- `summarize`: Added self_time_change as percentage change of self_time from base to the `diff` sub command ([GH-87])
 
 ### Changed
 - `measureme`: Events are recorded in a more compact format ([GH-76])
@@ -50,3 +51,4 @@
 [GH-73]: https://github.com/rust-lang/measureme/pull/73
 [GH-76]: https://github.com/rust-lang/measureme/pull/76
 [GH-84]: https://github.com/rust-lang/measureme/pull/84
+[GH-87]: https://github.com/rust-lang/measureme/pull/87

summarize/src/diff.rs

@@ -44,8 +44,8 @@ pub fn calculate_diff(base: Results, change: Results) -> DiffResults {
 
             match (b, c) {
                 (Some(b), Some(c)) => c.clone() - b.clone(),
-                (Some(b), None) => b.as_query_data_diff(),
-                (None, Some(c)) => c.invert(),
+                (Some(b), None) => b.invert(),
+                (None, Some(c)) => c.as_query_data_diff(),
                 (None, None) => unreachable!(),
             }
         })

summarize/src/main.rs

@@ -88,6 +88,7 @@ fn diff(opt: DiffOpt) -> Result<(), Box<dyn Error>> {
     table.add_row(row!(
         "Item",
         "Self Time",
+        "Self Time Change",
         "Item count",
         "Cache hits",
         "Blocked time",
@@ -100,19 +101,12 @@ fn diff(opt: DiffOpt) -> Result<(), Box<dyn Error>> {
             continue;
         }
 
-        fn print_i64(i: i64) -> String {
-            if i >= 0 {
-                format!("+{}", i)
-            } else {
-                format!("{}", i)
-            }
-        }
-
         table.add_row(row![
             query_data.label,
             format!("{:.2?}", query_data.self_time),
-            print_i64(query_data.invocation_count),
-            print_i64(query_data.number_of_cache_hits),
+            format!("{:+.2}%", query_data.self_time_change),
+            format!("{:+}", query_data.invocation_count),
+            format!("{:+}", query_data.number_of_cache_hits),
             format!("{:.2?}", query_data.blocked_time),
             format!("{:.2?}", query_data.incremental_load_time),
         ]);

summarize/src/query_data.rs

@@ -38,6 +38,7 @@ impl QueryData {
         QueryDataDiff {
             label: self.label.clone(),
             self_time: invert(self.self_time),
+            self_time_change: -100.0,
             number_of_cache_misses: -(self.number_of_cache_misses as i64),
             number_of_cache_hits: -(self.number_of_cache_hits as i64),
             invocation_count: -(self.invocation_count as i64),
@@ -50,6 +51,7 @@ impl QueryData {
         QueryDataDiff {
             label: self.label.clone(),
             self_time: self.self_time.into(),
+            self_time_change: std::f64::INFINITY,
             number_of_cache_misses: self.number_of_cache_misses as i64,
             number_of_cache_hits: self.number_of_cache_hits as i64,
             invocation_count: self.invocation_count as i64,
@@ -63,6 +65,7 @@ impl QueryData {
 pub struct QueryDataDiff {
     pub label: String,
     pub self_time: SignedDuration,
+    pub self_time_change: f64,
     pub number_of_cache_misses: i64,
     pub number_of_cache_hits: i64,
     pub invocation_count: i64,
@@ -87,6 +90,7 @@ impl Sub for QueryData {
         QueryDataDiff {
             label: self.label,
             self_time: sd(self.self_time) - sd(rhs.self_time),
+            self_time_change: percentage_change(rhs.self_time, self.self_time),
             number_of_cache_misses: i(self.number_of_cache_misses) - i(rhs.number_of_cache_misses),
             number_of_cache_hits: i(self.number_of_cache_hits) - i(rhs.number_of_cache_hits),
             invocation_count: i(self.invocation_count) - i(rhs.invocation_count),
@@ -96,6 +100,11 @@ impl Sub for QueryData {
     }
 }
 
+fn percentage_change(base: Duration, change: Duration) -> f64 {
+    let self_time_nanos = change.as_nanos() as i128 - base.as_nanos() as i128;
+    self_time_nanos as f64 / base.as_nanos() as f64 * 100.0
+}
+
 #[derive(Serialize, Deserialize)]
 pub struct Results {
     pub query_data: Vec<QueryData>,