rename checked_add methods

Author: pvdrz

src/shims/time.rs

@@ -66,7 +66,7 @@ impl Clock {
     }
 
     /// Compute `now + duration` relative to this clock.
-    pub fn checked_add_since_now(&self, duration: Duration) -> Option<Time> {
+    pub fn get_time_relative(&self, duration: Duration) -> Option<Time> {
         match self {
             Self::Host { .. } => Instant::now().checked_add(duration).map(Time::Monotonic),
             Self::Virtual { nanoseconds } =>
@@ -79,7 +79,7 @@ impl Clock {
 
     /// Compute `start + duration` relative to this clock where `start` is the instant of time when
     /// this clock was created.
-    pub fn checked_add_since_start(&self, duration: Duration) -> Option<Time> {
+    pub fn get_time_absolute(&self, duration: Duration) -> Option<Time> {
         match self {
             Self::Host { time_anchor } => time_anchor.checked_add(duration).map(Time::Monotonic),
             Self::Virtual { .. } =>
@@ -301,10 +301,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
             }
         };
         // If adding the duration overflows, let's just sleep for an hour. Waking up early is always acceptable.
-        let timeout_time =
-            this.machine.clock.checked_add_since_now(duration).unwrap_or_else(|| {
-                this.machine.clock.checked_add_since_now(Duration::from_secs(3600)).unwrap()
-            });
+        let timeout_time = this.machine.clock.get_time_relative(duration).unwrap_or_else(|| {
+            this.machine.clock.get_time_relative(Duration::from_secs(3600)).unwrap()
+        });
 
         let active_thread = this.get_active_thread();
         this.block_thread(active_thread);
@@ -330,7 +329,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let timeout_ms = this.read_scalar(timeout)?.to_u32()?;
 
         let duration = Duration::from_millis(timeout_ms.into());
-        let timeout_time = this.machine.clock.checked_add_since_now(duration).unwrap();
+        let timeout_time = this.machine.clock.get_time_relative(duration).unwrap();
 
         let active_thread = this.get_active_thread();
         this.block_thread(active_thread);

src/shims/unix/linux/sync.rs

@@ -106,14 +106,14 @@ pub fn futex<'tcx>(
                     if op & futex_realtime != 0 {
                         Time::RealTime(SystemTime::UNIX_EPOCH.checked_add(duration).unwrap())
                     } else {
-                        this.machine.clock.checked_add_since_start(duration).unwrap()
+                        this.machine.clock.get_time_absolute(duration).unwrap()
                     }
                 } else {
                     // FUTEX_WAIT uses a relative timestamp.
                     if op & futex_realtime != 0 {
                         Time::RealTime(SystemTime::now().checked_add(duration).unwrap())
                     } else {
-                        this.machine.clock.checked_add_since_now(duration).unwrap()
+                        this.machine.clock.get_time_relative(duration).unwrap()
                     }
                 })
             };

src/shims/unix/sync.rs

@@ -859,7 +859,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         let timeout_time = if clock_id == this.eval_libc_i32("CLOCK_REALTIME")? {
             Time::RealTime(SystemTime::UNIX_EPOCH.checked_add(duration).unwrap())
         } else if clock_id == this.eval_libc_i32("CLOCK_MONOTONIC")? {
-            this.machine.clock.checked_add_since_start(duration).unwrap()
+            this.machine.clock.get_time_absolute(duration).unwrap()
         } else {
             throw_unsup_format!("unsupported clock id: {}", clock_id);
         };