fix time on x86_64 macos

Signed-off-by: Runji Wang <[email protected]>

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## madsim [0.2.24] - 2024-01-05
+
+### Fixed
+
+- Fix intercepting time on x86_64 macOS, Rust 1.75.0.
+
 ## rdkafka [0.3.1] - 2024-01-05
 
 ### Fixed

madsim/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "madsim"
-version = "0.2.23"
+version = "0.2.24"
 edition = "2021"
 authors = ["Runji Wang <[email protected]>"]
 description = "Deterministic Simulator for distributed systems."

madsim/src/sim/time/system_time.rs

@@ -37,7 +37,8 @@ unsafe extern "C" fn gettimeofday(tp: *mut libc::timeval, tz: *mut libc::c_void)
     }
 }
 
-/// Override the libc `clock_gettime` function. For Linux and ARM64 macOS.
+/// Override the libc `clock_gettime` function.
+/// For Linux, ARM64 macOS (since 1.67) and x86_64 macOS (since 1.75).
 #[no_mangle]
 #[inline(never)]
 unsafe extern "C" fn clock_gettime(
@@ -86,12 +87,14 @@ unsafe extern "C" fn clock_gettime(
     }
 }
 
-/// Override the `mach_absolute_time` function. For `Instant` on x86_64 macOS.
+/// Override the `mach_absolute_time` function. For `Instant` on macOS before Rust 1.75.
 #[no_mangle]
 #[inline(never)]
 #[cfg(target_os = "macos")]
 // not used on ARM64 macOS after https://github.com/rust-lang/rust/pull/103594
 #[rustversion::attr(since(1.67), cfg(not(target_arch = "aarch64")))]
+// not used on x86_64 macOS after https://github.com/rust-lang/rust/pull/116238
+#[rustversion::attr(since(1.75), cfg(not(target_arch = "x86_64")))]
 extern "C" fn mach_absolute_time() -> u64 {
     if let Some(time) = super::TimeHandle::try_current() {
         // inside a madsim context, use the simulated time.