Moved i128 conversion of nanos into statime.

pendulum-project · Aug 16, 2023 · 4c28412 · 4c28412
1 parent bc5dc49
commit 4c28412
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/statime-linux/Cargo.toml b/statime-linux/Cargo.toml
@@ -9,7 +9,6 @@ edition = "2021"
 arrayvec = { version = "0.7.4", default-features = false }
 clap = { version = "4.3.21", features = ["derive"] }
 fern = { version = "0.6.2", features = ["colored"] }
-fixed = "1.23"
 libc = { version = "0.2.147", features = ["extra_traits"] }
 log = "0.4.20"
 statime = { path = "../statime" }

diff --git a/statime-linux/src/clock/mod.rs b/statime-linux/src/clock/mod.rs
@@ -3,7 +3,6 @@
 use std::path::Path;
 
 use clock_steering::{unix::UnixClock, TimeOffset};
-use fixed::traits::LossyInto;
 use statime::{Clock, Duration, Time, TimePropertiesDS};
 
 #[derive(Debug, Clone)]
@@ -102,7 +101,7 @@ impl Clock for LinuxClock {
 
         // Since we want nanos to be in [0,1_000_000_000), we need
         // euclidean division and remainder.
-        let offset_nanos: i128 = time_offset.nanos().lossy_into();
+        let offset_nanos: i128 = time_offset.nanos_rounded();
         let offset = TimeOffset {
             seconds: offset_nanos
                 .div_euclid(1_000_000_000)

diff --git a/statime/src/time/duration.rs b/statime/src/time/duration.rs
@@ -63,6 +63,10 @@ impl Duration {
         self.inner
     }
 
+    pub fn nanos_rounded(&self) -> i128 {
+        self.nanos().lossy_into()
+    }
+
     /// Get the total amount of nanoseconds, losing some precision
     pub fn nanos_lossy(&self) -> f64 {
         self.nanos().lossy_into()