chore: wip [skip ci]

Author: not-matthias

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

@@ -125,7 +125,7 @@ impl PerfRunner {
             "sh",
             "-c",
             &format!(
-                "perf record {quiet_flag} --user-callchains --freq=999 --switch-output --control=fifo:{},{} --delay=-1 -g --call-graph={cg_mode} --output={} -- {bench_cmd}",
+                "perf record {quiet_flag} --timestamp -k CLOCK_MONOTONIC --user-callchains --freq=999 --switch-output --control=fifo:{},{} --delay=-1 -g --call-graph={cg_mode} --output={} -- {bench_cmd}",
                 perf_fifo.ctl_fifo_path.to_string_lossy(),
                 perf_fifo.ack_fifo_path.to_string_lossy(),
                 perf_file.path().to_string_lossy(),
@@ -305,10 +305,11 @@ 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 integration = None;
         let mut perf_ping_timeout = 5;
 
-        let perf_pid = OnceCell::new();
         loop {
             let perf_ping =
                 tokio::time::timeout(Duration::from_secs(perf_ping_timeout), perf_fifo.ping())
@@ -343,22 +344,6 @@ impl PerfRunner {
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
                 FifoCommand::StartBenchmark => {
-                    let perf_pid = perf_pid.get_or_init(|| {
-                        let output = std::process::Command::new("sh")
-                            .arg("-c")
-                            .arg("pidof -s perf")
-                            .output()
-                            .expect("Failed to run pidof command");
-
-                        String::from_utf8_lossy(&output.stdout)
-                            .trim()
-                            .parse::<u32>()
-                            .expect("Failed to parse perf pid")
-                    });
-
-                    // Split the perf.data file
-                    run_with_sudo(&["kill", "-USR2", &perf_pid.to_string()])?;
-
                     perf_fifo.start_events().await?;
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
@@ -377,6 +362,10 @@ impl PerfRunner {
                     integration = Some((name, version));
                     runner_fifo.send_cmd(FifoCommand::Ack).await?;
                 }
+                FifoCommand::AddMarker { pid, marker } => {
+                    markers_by_pid.entry(pid).or_default().push(marker);
+                    runner_fifo.send_cmd(FifoCommand::Ack).await?;
+                }
                 FifoCommand::Ack => unreachable!(),
                 FifoCommand::Err => unreachable!(),
             }

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

@@ -3,6 +3,12 @@
 pub const RUNNER_CTL_FIFO: &str = "/tmp/runner.ctl.fifo";
 pub const RUNNER_ACK_FIFO: &str = "/tmp/runner.ack.fifo";
 
+#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq)]
+pub enum MarkerType {
+    BenchmarkStart(u64),
+    BenchmarkEnd(u64),
+}
+
 #[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq)]
 pub enum Command {
     CurrentBenchmark { pid: u32, uri: String },
@@ -12,4 +18,5 @@ pub enum Command {
     PingPerf,
     SetIntegration { name: String, version: String },
     Err,
+    AddMarker { pid: u32, marker: MarkerType },
 }