keep base time instant reference in z_clock_t

eclipse-zenoh · Feb 29, 2024 · 3ffe9ca · 3ffe9ca
1 parent 6561fdc
commit 3ffe9ca
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/include/zenoh_commons.h b/include/zenoh_commons.h
@@ -204,6 +204,7 @@ typedef struct z_owned_bytes_map_t {
  */
 typedef struct z_clock_t {
   uint64_t t;
+  const void *t_base;
 } z_clock_t;
 /**
  * Represents a Zenoh ID.

diff --git a/src/platform/clock.rs b/src/platform/clock.rs
@@ -2,6 +2,7 @@ use chrono::{DateTime, Local};
 use libc::c_char;
 use std::{
     cmp::min,
+    os::raw::c_void,
     slice,
     time::{Duration, Instant, SystemTime, UNIX_EPOCH},
 };
@@ -22,20 +23,24 @@ lazy_static! {
 #[derive(Clone, Copy)]
 pub struct z_clock_t {
     t: u64,
+    t_base: *const c_void,
 }
 
 #[no_mangle]
 pub extern "C" fn z_clock_now() -> z_clock_t {
     z_clock_t {
         t: CLOCK_BASE.elapsed().as_nanos() as u64,
+        t_base: &CLOCK_BASE as *const CLOCK_BASE as *const c_void,
     }
 }
 #[allow(clippy::missing_safety_doc)]
 unsafe fn get_elapsed_nanos(time: *const z_clock_t) -> u64 {
     if time.is_null() {
         return 0;
     }
-    let now_t = z_clock_now().t;
+    let now_t = (*((*time).t_base as *const CLOCK_BASE))
+        .elapsed()
+        .as_nanos() as u64;
     if now_t > (*time).t {
         now_t - (*time).t
     } else {