Make output of mmview more readable.

Author: michaelwoerister

mmview/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2018"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-measureme = { path = "../measureme" }
 analyzeme = { path = "../analyzeme" }
+measureme = { path = "../measureme" }
 structopt = "0.2"

mmview/src/main.rs

@@ -1,7 +1,7 @@
-use analyzeme::ProfilingData;
+use analyzeme::{Event, ProfilingData, Timestamp};
 use std::error::Error;
 use std::path::PathBuf;
-
+use std::time::{Duration, SystemTime};
 use structopt::StructOpt;
 
 #[derive(StructOpt, Debug)]
@@ -18,15 +18,49 @@ fn main() -> Result<(), Box<dyn Error>> {
 
     let data = ProfilingData::new(&opt.file_prefix)?;
 
+    let global_start_time = data.iter().map(|e| e.timestamp.start()).min().unwrap();
+
     for event in data.iter() {
         if let Some(thread_id) = opt.thread_id {
             if event.thread_id != thread_id {
                 continue;
             }
         }
 
-        println!("{:?}", event);
+        print_event(&event.to_event(), global_start_time);
     }
 
     Ok(())
 }
+
+fn system_time_to_micros_since(t: SystemTime, since: SystemTime) -> u128 {
+    t.duration_since(since)
+        .unwrap_or(Duration::from_nanos(0))
+        .as_micros()
+}
+
+fn print_event(event: &Event<'_>, global_start_time: SystemTime) {
+    let additional_data = event.additional_data.join(",");
+
+    let timestamp = match event.timestamp {
+        Timestamp::Instant(t) => {
+            format!("{} μs", system_time_to_micros_since(t, global_start_time))
+        }
+        Timestamp::Interval { start, end } => format!(
+            "{} μs - {} μs",
+            system_time_to_micros_since(start, global_start_time),
+            system_time_to_micros_since(end, global_start_time)
+        ),
+    };
+
+    println!(
+        r#"{{
+    kind: {},
+    label: {},
+    additional_data: [{}],
+    timestamp: {},
+    thread_id: {},
+}}"#,
+        event.event_kind, event.label, additional_data, timestamp, event.thread_id
+    );
+}