chore: wip [skip ci]

Author: not-matthias

crates/runner-shared/src/fifo.rs

@@ -15,17 +15,29 @@ pub enum MarkerType {
     BenchmarkEnd(u64),
 }
 
-// TODO: Maybe refactor this totally. Always send the pid and tid.
-// TODO: Add a version number to the protocol.
-
 #[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq)]
 pub enum Command {
     CurrentBenchmark { pid: u32, uri: String },
     StartBenchmark,
     StopBenchmark,
     Ack,
-    PingPerf, // TODO:: This can be removed, we don't need this anymore
+    PingPerf,
     SetIntegration { name: String, version: String },
     Err,
     AddMarker { pid: u32, marker: MarkerType },
 }
+
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq)]
+struct CommandV2 {
+    version: u32,
+    pid: u32,
+    command: CommandInfo,
+}
+
+enum CommandInfo {
+    Ack,
+    Err,
+    PingPerf,
+    ExecutedBenchmark { uri: String },
+    AddMarker { marker: MarkerType },
+}

crates/runner-shared/src/metadata.rs

@@ -13,6 +13,8 @@ pub const PERF_METADATA_CURRENT_VERSION: u64 = 1;
 
 #[derive(Serialize, Deserialize)]
 pub struct PerfMetadata {
+    /// The version of this metadata format.
+    /// Only available in version 1+
     #[serde(default)]
     pub version: u64,
 
@@ -26,9 +28,9 @@ pub struct PerfMetadata {
     pub ignored_modules: Vec<(String, u64, u64)>,
 
     /// Marker for certain regions in the profiling data
-    /// Only available in version 2+
+    /// Only available in version 1+
     #[serde(default)]
-    pub markers_by_pid: HashMap<u32, Vec<MarkerType>>,
+    pub markers: Vec<MarkerType>,
 }
 
 impl PerfMetadata {

src/run/runner/wall_time/perf/mod.rs

@@ -159,7 +159,7 @@ impl PerfRunner {
         // maps from /tmp to the profile folder. We have to write our own perf
         // maps to these files AFTERWARDS, otherwise it'll be overwritten!
         let bench_pids = bench_data
-            .markers_by_pid
+            .bench_order_by_pid
             .keys()
             .map(|pid| *pid as i32)
             .collect::<HashSet<_>>();
@@ -261,7 +261,7 @@ impl PerfRunner {
         let mut bench_order_by_pid = HashMap::<u32, Vec<String>>::new();
         let mut symbols_by_pid = HashMap::<u32, ProcessSymbols>::new();
         let mut unwind_data_by_pid = HashMap::<u32, Vec<UnwindData>>::new();
-        let mut markers_by_pid = HashMap::<u32, Vec<MarkerType>>::new();
+        let mut markers = Vec::<MarkerType>::new();
 
         let mut integration = None;
         let mut perf_ping_timeout = 5;
@@ -300,10 +300,21 @@ impl PerfRunner {
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
                 FifoCommand::StartBenchmark => {
+                    markers.push(MarkerType::SampleStart(
+                        std::time::SystemTime::now()
+                            .duration_since(std::time::UNIX_EPOCH)?
+                            .as_millis() as u64,
+                    ));
                     perf_fifo.start_events().await?;
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
                 FifoCommand::StopBenchmark => {
+                    markers.push(MarkerType::SampleEnd(
+                        std::time::SystemTime::now()
+                            .duration_since(std::time::UNIX_EPOCH)?
+                            .as_millis() as u64,
+                    ));
+
                     perf_fifo.stop_events().await?;
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
@@ -319,11 +330,13 @@ impl PerfRunner {
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
                 FifoCommand::AddMarker { pid, marker } => {
-                    markers_by_pid.entry(pid).or_default().push(marker);
+                    markers.push(marker);
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
-                FifoCommand::Ack => unreachable!(),
-                FifoCommand::Err => unreachable!(),
+                _ => {
+                    warn!("Received unexpected command: {cmd:?}");
+                    runner_fifo.send_cmd(FifoCommand::Err).await?;
+                }
             }
         }
 
@@ -332,7 +345,7 @@ impl PerfRunner {
             bench_order_by_pid,
             symbols_by_pid,
             unwind_data_by_pid,
-            markers_by_pid,
+            markers,
         })
     }
 }
@@ -344,7 +357,7 @@ pub struct BenchmarkData {
     bench_order_by_pid: HashMap<u32, Vec<String>>,
     symbols_by_pid: HashMap<u32, ProcessSymbols>,
     unwind_data_by_pid: HashMap<u32, Vec<UnwindData>>,
-    markers_by_pid: HashMap<u32, Vec<MarkerType>>,
+    markers: Vec<MarkerType>,
 }
 
 #[derive(Debug)]
@@ -419,7 +432,7 @@ impl BenchmarkData {
 
                 to_ignore
             },
-            markers_by_pid: self.markers_by_pid.clone(),
+            markers: self.markers.clone(),
         };
         metadata.save_to(&path).unwrap();