pyturso 0.4.3rc2__tar.gz → 0.4.4rc1__tar.gz

{pyturso-0.4.3rc2 → pyturso-0.4.4rc1}/Cargo.lock

@@ -896,7 +896,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core_tester"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -2729,7 +2729,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_completion"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2737,7 +2737,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_crypto"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "blake3",
  "data-encoding",
@@ -2750,7 +2750,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_csv"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "csv",
  "mimalloc",
@@ -2760,7 +2760,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_fuzzy"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2768,7 +2768,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_ipaddr"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "ipnetwork",
  "mimalloc",
@@ -2777,7 +2777,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_percentile"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "mimalloc",
  "turso_ext",
@@ -2785,7 +2785,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_regexp"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "mimalloc",
  "regex",
@@ -2794,7 +2794,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sim"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "anyhow",
  "bitflags 2.9.4",
@@ -2831,7 +2831,7 @@ dependencies = [
 
 [[package]]
 name = "limbo_sqlite_test_ext"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "cc",
 ]
@@ -3718,7 +3718,7 @@ dependencies = [
 
 [[package]]
 name = "py-turso"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "anyhow",
  "pyo3",
@@ -4595,7 +4595,7 @@ checksum = "d372029cb5195f9ab4e4b9aef550787dce78b124fcaee8d82519925defcd6f0d"
 
 [[package]]
 name = "sql_generation"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "anarchist-readable-name-generator-lib",
  "anyhow",
@@ -5299,7 +5299,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "turso"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5323,14 +5323,14 @@ dependencies = [
 
 [[package]]
 name = "turso-dotnet"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "turso_core",
 ]
 
 [[package]]
 name = "turso-java"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "jni",
  "thiserror 2.0.16",
@@ -5339,7 +5339,7 @@ dependencies = [
 
 [[package]]
 name = "turso_cli"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5380,7 +5380,7 @@ dependencies = [
 
 [[package]]
 name = "turso_core"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "aegis",
  "aes",
@@ -5447,7 +5447,7 @@ dependencies = [
 
 [[package]]
 name = "turso_dart"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "flutter_rust_bridge",
  "turso_core",
@@ -5455,7 +5455,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "chrono",
  "getrandom 0.3.2",
@@ -5464,7 +5464,7 @@ dependencies = [
 
 [[package]]
 name = "turso_ext_tests"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "env_logger 0.11.7",
  "lazy_static",
@@ -5475,7 +5475,7 @@ dependencies = [
 
 [[package]]
 name = "turso_macros"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5484,7 +5484,7 @@ dependencies = [
 
 [[package]]
 name = "turso_node"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "chrono",
  "napi",
@@ -5497,7 +5497,7 @@ dependencies = [
 
 [[package]]
 name = "turso_parser"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "bitflags 2.9.4",
  "criterion",
@@ -5514,7 +5514,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sdk_kit"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "bindgen",
  "env_logger 0.11.7",
@@ -5527,7 +5527,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sdk_kit_macros"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5536,7 +5536,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sqlite3"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "env_logger 0.11.7",
  "libc",
@@ -5549,7 +5549,7 @@ dependencies = [
 
 [[package]]
 name = "turso_stress"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "antithesis_sdk",
  "clap",
@@ -5565,7 +5565,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_engine"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -5592,7 +5592,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_js"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "genawaiter",
  "napi",
@@ -5607,7 +5607,7 @@ dependencies = [
 
 [[package]]
 name = "turso_sync_sdk_kit"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "bindgen",
  "env_logger 0.11.7",
@@ -5624,7 +5624,7 @@ dependencies = [
 
 [[package]]
 name = "turso_whopper"
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 dependencies = [
  "anyhow",
  "clap",

{pyturso-0.4.3rc2 → pyturso-0.4.4rc1}/Cargo.toml

@@ -6,24 +6,24 @@ members = ["bindings/python"]
 exclude = ["perf/latency/limbo", "turso-test-runner"]
 
 [workspace.package]
-version = "0.4.3-pre.2"
+version = "0.4.4-pre.1"
 authors = ["the Limbo authors"]
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/tursodatabase/turso"
 
 [workspace.dependencies]
-turso = { path = "bindings/rust", version = "0.4.3-pre.2" }
-turso_node = { path = "bindings/javascript", version = "0.4.3-pre.2" }
-turso_sdk_kit = { path = "sdk-kit", version = "0.4.3-pre.2" }
-turso_sdk_kit_macros = { path = "sdk-kit-macros", version = "0.4.3-pre.2" }
-turso_sync_sdk_kit = { path = "sync/sdk-kit", version = "0.4.3-pre.2" }
-limbo_completion = { path = "extensions/completion", version = "0.4.3-pre.2" }
-turso_core = { path = "core", version = "0.4.3-pre.2" }
-turso_sync_engine = { path = "sync/engine", version = "0.4.3-pre.2" }
-turso_ext = { path = "extensions/core", version = "0.4.3-pre.2" }
-turso_macros = { path = "macros", version = "0.4.3-pre.2" }
-turso_parser = { path = "parser", version = "0.4.3-pre.2" }
+turso = { path = "bindings/rust", version = "0.4.4-pre.1" }
+turso_node = { path = "bindings/javascript", version = "0.4.4-pre.1" }
+turso_sdk_kit = { path = "sdk-kit", version = "0.4.4-pre.1" }
+turso_sdk_kit_macros = { path = "sdk-kit-macros", version = "0.4.4-pre.1" }
+turso_sync_sdk_kit = { path = "sync/sdk-kit", version = "0.4.4-pre.1" }
+limbo_completion = { path = "extensions/completion", version = "0.4.4-pre.1" }
+turso_core = { path = "core", version = "0.4.4-pre.1" }
+turso_sync_engine = { path = "sync/engine", version = "0.4.4-pre.1" }
+turso_ext = { path = "extensions/core", version = "0.4.4-pre.1" }
+turso_macros = { path = "macros", version = "0.4.4-pre.1" }
+turso_parser = { path = "parser", version = "0.4.4-pre.1" }
 sql_generation = { path = "sql_generation" }
 strum = { version = "0.26", features = ["derive"] }
 strum_macros = "0.26"

{pyturso-0.4.3rc2 → pyturso-0.4.4rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyturso
-Version: 0.4.3rc2
+Version: 0.4.4rc1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pyturso-0.4.3rc2 → pyturso-0.4.4rc1}/bindings/python/src/turso.rs

@@ -18,6 +18,12 @@ pub enum PyTursoStatusCode {
     Io = 3,
 }
 create_exception!(turso, Busy, PyException, "database is locked");
+create_exception!(
+    turso,
+    BusySnapshot,
+    PyException,
+    "database snapshot is stale"
+);
 create_exception!(turso, Interrupt, PyException, "interrupted");
 create_exception!(turso, Error, PyException, "generic error");
 create_exception!(turso, Misuse, PyException, "API misuse");
@@ -31,6 +37,7 @@ create_exception!(turso, IoError, PyException, "I/O error");
 pub(crate) fn turso_error_to_py_err(err: TursoError) -> PyErr {
     match err {
         rsapi::TursoError::Busy(message) => Busy::new_err(message),
+        rsapi::TursoError::BusySnapshot(message) => BusySnapshot::new_err(message),
         rsapi::TursoError::Interrupt(message) => Interrupt::new_err(message),
         rsapi::TursoError::Error(message) => Error::new_err(message),
         rsapi::TursoError::Misuse(message) => Misuse::new_err(message),

{pyturso-0.4.3rc2 → pyturso-0.4.4rc1}/core/busy.rs

@@ -1,4 +1,4 @@
-use crate::Instant;
+use crate::MonotonicInstant;
 use std::time::Duration;
 
 /// Type alias for busy handler callback function.
@@ -52,7 +52,7 @@ pub struct BusyHandlerState {
     /// Number of times the busy handler has been invoked for this locking event
     invocation_count: i32,
     /// For timeout-based handlers: the next timeout instant to wait until
-    timeout: Instant,
+    timeout: MonotonicInstant,
     /// For timeout-based handlers: the current iteration index into DELAYS
     iteration: usize,
 }
@@ -91,7 +91,7 @@ impl BusyHandlerState {
     ];
 
     /// Create a new busy handler state
-    pub fn new(now: Instant) -> Self {
+    pub fn new(now: MonotonicInstant) -> Self {
         Self {
             invocation_count: 0,
             timeout: now,
@@ -100,14 +100,14 @@ impl BusyHandlerState {
     }
 
     /// Reset the state for a new locking event
-    pub fn reset(&mut self, now: Instant) {
+    pub fn reset(&mut self, now: MonotonicInstant) {
         self.invocation_count = 0;
         self.timeout = now;
         self.iteration = 0;
     }
 
     /// Get the current timeout instant
-    pub fn timeout(&self) -> Instant {
+    pub fn timeout(&self) -> MonotonicInstant {
         self.timeout
     }
 
@@ -118,7 +118,7 @@ impl BusyHandlerState {
     ///
     /// For timeout-based handlers, this also updates the internal timeout instant.
     /// For custom handlers, this invokes the callback and respects its return value.
-    pub fn invoke(&mut self, handler: &BusyHandler, now: Instant) -> bool {
+    pub fn invoke(&mut self, handler: &BusyHandler, now: MonotonicInstant) -> bool {
         match handler {
             BusyHandler::None => {
                 // No handler: return BUSY immediately
@@ -142,7 +142,7 @@ impl BusyHandlerState {
     /// Implements sqliteDefaultBusyCallback logic for timeout-based handling.
     ///
     /// This uses an exponentially increasing delay schedule, capped at 100ms per iteration.
-    fn invoke_timeout_handler(&mut self, max_duration: Duration, now: Instant) -> bool {
+    fn invoke_timeout_handler(&mut self, max_duration: Duration, now: MonotonicInstant) -> bool {
         let idx = self.iteration.min(11);
         let mut delay = Self::DELAYS[idx];
         let mut prior = Self::TOTALS[idx];
@@ -170,21 +170,11 @@ impl BusyHandlerState {
     ///
     /// This returns the duration between `now` and the timeout instant.
     /// Returns `Duration::ZERO` if the timeout has already passed.
-    pub fn get_delay(&self, now: Instant) -> Duration {
-        if now.secs > self.timeout.secs
-            || (now.secs == self.timeout.secs && now.micros >= self.timeout.micros)
-        {
+    pub fn get_delay(&self, now: MonotonicInstant) -> Duration {
+        if now >= self.timeout {
             Duration::ZERO
         } else {
-            let secs_diff = (self.timeout.secs - now.secs) as u64;
-            let micros_diff = if self.timeout.micros >= now.micros {
-                self.timeout.micros - now.micros
-            } else {
-                // Borrow from seconds
-                return Duration::from_secs(secs_diff.saturating_sub(1))
-                    + Duration::from_micros((1_000_000 + self.timeout.micros - now.micros) as u64);
-            };
-            Duration::from_secs(secs_diff) + Duration::from_micros(micros_diff as u64)
+            self.timeout.duration_since(now)
         }
     }
 }
@@ -192,8 +182,9 @@ impl BusyHandlerState {
 #[cfg(test)]
 mod tests {
     use super::*;
-    fn test_instant() -> Instant {
-        Instant { secs: 0, micros: 0 }
+
+    fn test_instant() -> MonotonicInstant {
+        MonotonicInstant::now()
     }
 
     #[test]
@@ -365,7 +356,7 @@ mod tests {
         state.invoke(&handler, now);
 
         // Reset
-        let later = Instant { secs: 1, micros: 0 };
+        let later = MonotonicInstant::now();
         state.reset(later);
 
         // Should be back to initial state
@@ -377,25 +368,21 @@ mod tests {
 
     #[test]
     fn test_get_delay_when_timeout_passed() {
-        let now = Instant {
-            secs: 10,
-            micros: 0,
-        };
+        let now = MonotonicInstant::now();
         let state = BusyHandlerState::new(now);
 
         // Timeout is at `now`, so any time >= now should return zero delay
         assert_eq!(state.get_delay(now), Duration::ZERO);
 
-        let later = Instant {
-            secs: 11,
-            micros: 0,
-        };
+        // A later time should also return zero
+        std::thread::sleep(Duration::from_micros(10));
+        let later = MonotonicInstant::now();
         assert_eq!(state.get_delay(later), Duration::ZERO);
     }
 
     #[test]
     fn test_get_delay_calculates_remaining_time() {
-        let now = Instant { secs: 0, micros: 0 };
+        let now = MonotonicInstant::now();
         let mut state = BusyHandlerState::new(now);
 
         let handler = BusyHandler::Timeout(Duration::from_millis(100));
@@ -404,13 +391,5 @@ mod tests {
         // Check delay from `now` - should be 1ms
         let delay = state.get_delay(now);
         assert_eq!(delay, Duration::from_millis(1));
-
-        // Check delay from half-way point
-        let half = Instant {
-            secs: 0,
-            micros: 500,
-        };
-        let delay = state.get_delay(half);
-        assert_eq!(delay, Duration::from_micros(500));
     }
 }

pyturso-0.4.4rc1/core/io/clock.rs

@@ -0,0 +1,150 @@
+use std::time::{Duration, SystemTime, UNIX_EPOCH};
+
+/// A monotonic instant in time, backed by `std::time::Instant`.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct MonotonicInstant(std::time::Instant);
+
+impl MonotonicInstant {
+    pub fn now() -> Self {
+        MonotonicInstant(std::time::Instant::now())
+    }
+
+    pub fn elapsed(&self) -> Duration {
+        self.0.elapsed()
+    }
+
+    pub fn duration_since(&self, earlier: MonotonicInstant) -> Duration {
+        self.0.duration_since(earlier.0)
+    }
+
+    pub fn checked_add(&self, duration: Duration) -> Option<MonotonicInstant> {
+        self.0.checked_add(duration).map(MonotonicInstant)
+    }
+
+    pub fn checked_sub(&self, duration: Duration) -> Option<MonotonicInstant> {
+        self.0.checked_sub(duration).map(MonotonicInstant)
+    }
+}
+
+impl std::ops::Add<Duration> for MonotonicInstant {
+    type Output = MonotonicInstant;
+
+    fn add(self, rhs: Duration) -> Self::Output {
+        MonotonicInstant(self.0 + rhs)
+    }
+}
+
+impl std::ops::Sub<Duration> for MonotonicInstant {
+    type Output = MonotonicInstant;
+
+    fn sub(self, rhs: Duration) -> Self::Output {
+        MonotonicInstant(self.0 - rhs)
+    }
+}
+
+/// Wall-clock time as seconds and microseconds since Unix epoch.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+pub struct WallClockInstant {
+    pub secs: i64,
+    pub micros: u32,
+}
+
+const MICROS_PER_SEC: u32 = 1_000_000;
+
+impl WallClockInstant {
+    pub fn now() -> Self {
+        let duration = SystemTime::now()
+            .duration_since(UNIX_EPOCH)
+            .expect("system time before Unix epoch");
+        WallClockInstant {
+            secs: duration.as_secs() as i64,
+            micros: duration.subsec_micros(),
+        }
+    }
+
+    pub fn to_system_time(self) -> SystemTime {
+        if self.secs >= 0 {
+            UNIX_EPOCH + Duration::new(self.secs as u64, self.micros * 1000)
+        } else {
+            let positive_secs = (-self.secs) as u64;
+            if self.micros > 0 {
+                let nanos_to_subtract = (1_000_000 - self.micros) * 1000;
+                UNIX_EPOCH - Duration::new(positive_secs - 1, nanos_to_subtract)
+            } else {
+                UNIX_EPOCH - Duration::new(positive_secs, 0)
+            }
+        }
+    }
+
+    pub fn checked_add_duration(&self, other: &Duration) -> Option<WallClockInstant> {
+        let mut secs = self.secs.checked_add_unsigned(other.as_secs())?;
+        let mut micros = other.subsec_micros() + self.micros;
+        if micros >= MICROS_PER_SEC {
+            micros -= MICROS_PER_SEC;
+            secs = secs.checked_add(1)?;
+        }
+        Some(Self { secs, micros })
+    }
+
+    pub fn checked_sub_duration(&self, other: &Duration) -> Option<WallClockInstant> {
+        let mut secs = self.secs.checked_sub_unsigned(other.as_secs())?;
+        let mut micros = self.micros as i32 - other.subsec_micros() as i32;
+        if micros < 0 {
+            micros += MICROS_PER_SEC as i32;
+            secs = secs.checked_sub(1)?;
+        }
+        Some(Self {
+            secs,
+            micros: micros as u32,
+        })
+    }
+}
+
+impl std::ops::Add<Duration> for WallClockInstant {
+    type Output = WallClockInstant;
+
+    fn add(self, rhs: Duration) -> Self::Output {
+        self.checked_add_duration(&rhs)
+            .expect("duration addition overflow")
+    }
+}
+
+impl std::ops::Sub<Duration> for WallClockInstant {
+    type Output = WallClockInstant;
+
+    fn sub(self, rhs: Duration) -> Self::Output {
+        self.checked_sub_duration(&rhs)
+            .expect("duration subtraction underflow")
+    }
+}
+
+impl<T: chrono::TimeZone> From<chrono::DateTime<T>> for WallClockInstant {
+    fn from(value: chrono::DateTime<T>) -> Self {
+        WallClockInstant {
+            secs: value.timestamp(),
+            micros: value.timestamp_subsec_micros(),
+        }
+    }
+}
+
+pub trait Clock {
+    /// Monotonic time for timeout checking and elapsed time measurement.
+    /// Cheap on real systems (reads TSC), controllable in simulation.
+    fn current_time_monotonic(&self) -> MonotonicInstant;
+
+    /// Wall-clock time for timestamps (WAL, datetime functions).
+    /// Controllable in simulation for deterministic behavior.
+    fn current_time_wall_clock(&self) -> WallClockInstant;
+}
+
+pub struct DefaultClock;
+
+impl Clock for DefaultClock {
+    fn current_time_monotonic(&self) -> MonotonicInstant {
+        MonotonicInstant::now()
+    }
+
+    fn current_time_wall_clock(&self) -> WallClockInstant {
+        WallClockInstant::now()
+    }
+}

{pyturso-0.4.3rc2 → pyturso-0.4.4rc1}/core/io/generic.rs

@@ -1,4 +1,5 @@
-use crate::{io::clock::DefaultClock, Clock, Completion, File, Instant, OpenFlags, Result, IO};
+use crate::io::clock::{DefaultClock, MonotonicInstant, WallClockInstant};
+use crate::{Clock, Completion, File, OpenFlags, Result, IO};
 use parking_lot::RwLock;
 use std::io::{Read, Seek, Write};
 use std::sync::Arc;
@@ -43,8 +44,12 @@ impl IO for GenericIO {
 }
 
 impl Clock for GenericIO {
-    fn now(&self) -> Instant {
-        DefaultClock.now()
+    fn current_time_monotonic(&self) -> MonotonicInstant {
+        DefaultClock.current_time_monotonic()
+    }
+
+    fn current_time_wall_clock(&self) -> WallClockInstant {
+        DefaultClock.current_time_wall_clock()
     }
 }
 

{pyturso-0.4.3rc2 → pyturso-0.4.4rc1}/core/io/io_uring.rs

@@ -1,7 +1,7 @@
 #![allow(clippy::arc_with_non_send_sync)]
 
 use super::{common, Completion, CompletionInner, File, OpenFlags, IO};
-use crate::io::clock::{Clock, DefaultClock, Instant};
+use crate::io::clock::{Clock, DefaultClock, MonotonicInstant, WallClockInstant};
 use crate::storage::wal::CKPT_BATCH_PAGES;
 use crate::{turso_assert, CompletionError, LimboError, Result};
 use parking_lot::Mutex;
@@ -624,8 +624,12 @@ impl IO for UringIO {
 }
 
 impl Clock for UringIO {
-    fn now(&self) -> Instant {
-        DefaultClock.now()
+    fn current_time_monotonic(&self) -> MonotonicInstant {
+        DefaultClock.current_time_monotonic()
+    }
+
+    fn current_time_wall_clock(&self) -> WallClockInstant {
+        DefaultClock.current_time_wall_clock()
     }
 }