fixup! fix(walltime): use mach_absolute_time for FIFO timestamps on macOS

Author: not-matthias

Cargo.lock

@@ -62,6 +62,7 @@ futures = "0.3.31"
 runner-shared = { path = "crates/runner-shared" }
 memtrack = { path = "crates/memtrack", default-features = false }
 exec-harness = { path = "crates/exec-harness" }
+instrument-hooks-bindings = { path = "crates/instrument-hooks-bindings" }
 ipc-channel = "0.18"
 shellexpand = { version = "3.1.1", features = ["tilde"] }
 addr2line = "0.25"
@@ -79,9 +80,6 @@ samply = { git = "https://github.com/AvalancheHQ/samply", branch = "codspeed" }
 [target.'cfg(target_os = "linux")'.dependencies]
 procfs = "0.17.0"
 
-[target.'cfg(target_os = "macos")'.dependencies]
-mach2 = "0.4"
-
 [dev-dependencies]
 temp-env = { version = "0.3.6", features = ["async_closure"] }
 insta = { version = "1.29.0", features = ["json", "redactions"] }

Cargo.toml

@@ -175,39 +175,9 @@ impl RunnerFifo {
 
         let mut integration = None;
 
-        let current_time = || {
-            // Must match the clock used by instrument-hooks (`instrument_hooks_current_timestamp`)
-            // so timestamps from this process and the benchmarked process are comparable.
-            #[cfg(target_os = "macos")]
-            {
-                use mach2::mach_time;
-                use std::sync::OnceLock;
-
-                static NANOS_PER_TICK: OnceLock<mach_time::mach_timebase_info> = OnceLock::new();
-
-                let nanos_per_tick = NANOS_PER_TICK.get_or_init(|| unsafe {
-                    let mut info = mach_time::mach_timebase_info::default();
-                    let errno = mach_time::mach_timebase_info(&mut info as *mut _);
-                    if errno != 0 || info.denom == 0 {
-                        info.numer = 1;
-                        info.denom = 1;
-                    };
-                    info
-                });
-
-                let time = unsafe { mach_time::mach_absolute_time() };
-
-                time * nanos_per_tick.numer as u64 / nanos_per_tick.denom as u64
-            }
-
-            #[cfg(not(target_os = "macos"))]
-            {
-                use nix::{sys::time::TimeValLike, time::clock_gettime};
-
-                let clock = nix::time::ClockId::CLOCK_MONOTONIC;
-                clock_gettime(clock).unwrap().num_nanoseconds() as u64
-            }
-        };
+        // Must match the clock used by the benchmarked process so timestamps
+        // from both sides are comparable.
+        let current_time = instrument_hooks_bindings::InstrumentHooks::current_timestamp;
 
         let mut benchmark_started = false;