chore(deps): update rust crate config to v0.15.27

Cargo.lock

@@ -17,12 +17,6 @@ version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
 
-[[package]]
-name = "autocfg"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -80,12 +74,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
-[[package]]
-name = "cfg_aliases"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527"
-
 [[package]]
 name = "clang-sys"
 version = "1.8.1"
@@ -213,11 +201,10 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
 
 [[package]]
 name = "icmp-socket2"
-version = "0.6.4"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "816dc56a4f7f76e42b0616818600b05528cd346cb3843276e82df982d5c3ee26"
+checksum = "40c33803cfc44be36d1ce109e43f847063c35bdd11657c913c85536cb88c1e8c"
 dependencies = [
- "nix",
  "socket2",
  "thiserror",
 ]
@@ -310,15 +297,6 @@ version = "2.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
 
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -342,19 +320,6 @@ dependencies = [
  "strip-async",
 ]
 
-[[package]]
-name = "nix"
-version = "0.31.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
-dependencies = [
- "bitflags",
- "cfg-if",
- "cfg_aliases",
- "libc",
- "memoffset",
-]
-
 [[package]]
 name = "nom"
 version = "7.1.3"

Cargo.toml

@@ -20,7 +20,7 @@ strip = "symbols"
 
 [dependencies]
 anyhow = "1.0"
-icmp-socket2 = "0.6.4"
+icmp-socket2 = "0.6.2"
 fastrand = "2"
 rustix = { version = "1.1", features = ["fs", "system", "thread", "time"] }
 thiserror = "2.0"

src/log.rs

@@ -3,8 +3,9 @@
 // SPDX-License-Identifier: MPL-2.0
 
 use log::{Level, Metadata, Record, SetLoggerError};
+use rustix::time::ClockId;
 
-use crate::time::{ClockSample, Realtime};
+use crate::time::Time;
 
 #[derive(Clone, Copy)]
 pub struct SimpleLogger {
@@ -18,7 +19,7 @@ impl log::Log for SimpleLogger {
 
     fn log(&self, record: &Record) {
         if self.enabled(record.metadata()) {
-            let now = ClockSample::<Realtime>::now();
+            let now = Time::new(ClockId::Realtime);
             println!(
                 "{} {:5} {}:{}: {}",
                 now.as_secs_f64(),

src/metrics.rs

@@ -4,7 +4,7 @@
 
 use crate::settings::Settings;
 use crate::settings::{MeasurementType, ObservabilityProtocol};
-use crate::time::{ClockSample, Realtime};
+use crate::time::Time;
 use flume::{Receiver, RecvTimeoutError, Sender};
 use log::{error, info, warn};
 use rustix::time::ClockId;
@@ -148,7 +148,7 @@ impl MetricsSender {
 
     pub fn send(&self, metric: Metric) {
         if let Some(ref tx) = self.tx {
-            let ts = ClockSample::<Realtime>::now().as_nanos();
+            let ts = Time::new(ClockId::Realtime).as_nanos();
             if tx.try_send((metric, ts)).is_err() {
                 self.dropped.fetch_add(1, Ordering::Relaxed);
             }
@@ -197,7 +197,7 @@ impl Metrics {
                 Err(RecvTimeoutError::Timeout) => {
                     let dropped = self.metrics_dropped.swap(0, Ordering::Relaxed);
                     if dropped > 0 {
-                        let ts = ClockSample::<Realtime>::now().as_nanos();
+                        let ts = Time::new(ClockId::Realtime).as_nanos();
                         batch.push((Metric::Dropped { count: dropped }, ts));
                     }
                     if !batch.is_empty() {

src/pinger_icmp.rs

@@ -10,7 +10,7 @@ use std::time::Instant;
 
 use crate::pinger::{PingError, PingListener, PingReply, PingSender};
 use crate::settings::MeasurementType;
-use crate::time::{ClockSample, Monotonic};
+use crate::time::Time;
 use icmp_socket2::Icmpv4Message;
 use icmp_socket2::Icmpv4Packet;
 use icmp_socket2::packet::WithEchoRequest;
@@ -54,7 +54,7 @@ impl PingListener for PingerICMPEchoListener {
                         }
                     };
 
-                    let clock = ClockSample::<Monotonic>::now();
+                    let clock = Time::new(ClockId::Monotonic);
                     let time_ms = clock.to_milliseconds() as i64;
 
                     let rtt = (time_ms - time_sent) as f64;
@@ -85,7 +85,7 @@ impl PingListener for PingerICMPEchoListener {
 
 impl PingSender for PingerICMPEchoSender {
     fn craft_packet(&self, id: u16, seq: u16) -> (Icmpv4Packet, i64) {
-        let clock = ClockSample::<Monotonic>::now();
+        let clock = Time::new(ClockId::Monotonic);
         let time_ms = clock.to_milliseconds();
         let payload = time_ms.to_be_bytes().to_vec();
 

src/pinger_icmp_ts.rs

@@ -7,7 +7,7 @@
 
 use crate::pinger::{PingError, PingListener, PingReply, PingSender};
 use crate::settings::MeasurementType;
-use crate::time::{ClockSample, Realtime};
+use crate::time::Time;
 use icmp_socket2::Icmpv4Message;
 use icmp_socket2::Icmpv4Packet;
 use icmp_socket2::packet::WithTimestampRequest;
@@ -66,7 +66,7 @@ impl PingListener for PingerICMPTimestampListener {
                     }
 
                     let time_since_midnight =
-                        ClockSample::<Realtime>::now().as_time_since_midnight();
+                        Time::new(ClockId::Realtime).get_time_since_midnight();
 
                     let rtt = timestamp_delta(time_since_midnight, originate as i64) as f64;
                     let dl_time = timestamp_delta(time_since_midnight, transmit as i64) as f64;
@@ -99,7 +99,7 @@ impl PingListener for PingerICMPTimestampListener {
 
 impl PingSender for PingerICMPTimestampSender {
     fn craft_packet(&self, id: u16, seq: u16) -> (Icmpv4Packet, i64) {
-        let time_since_midnight = ClockSample::<Realtime>::now().as_time_since_midnight();
+        let time_since_midnight = Time::new(ClockId::Realtime).get_time_since_midnight();
         (
             Icmpv4Packet::with_timestamp_request(id, seq, time_since_midnight as u32, 0, 0)
                 .unwrap(),

src/ratecontroller.rs

@@ -13,7 +13,7 @@ use crate::platform::{
     interface_stats_provider, traffic_control_backend,
 };
 use crate::settings::Settings;
-use crate::time::{ClockSample, Realtime};
+use crate::time::Time;
 use crate::util::{ArcRwLock, RwLockExt};
 use flume::{Receiver, Sender};
 use log::{debug, info, warn};
@@ -409,7 +409,7 @@ impl<S: InterfaceStatsProvider, T: TrafficControlBackend> Ratecontroller<S, T> {
                 self.state_dl.current_rate = self.state_dl.next_rate;
                 self.state_ul.current_rate = self.state_ul.next_rate;
 
-                let stats_time = ClockSample::<Realtime>::now();
+                let stats_time = Time::new(ClockId::Realtime);
                 debug!(
                     "{},{},{},{},{},{},{},{}",
                     stats_time.secs(),
@@ -459,7 +459,7 @@ impl<S: InterfaceStatsProvider, T: TrafficControlBackend> Ratecontroller<S, T> {
                 && now_t.duration_since(lastdump_t).as_secs_f64() > 300.0
             {
                 for i in 0..self.settings.advanced_settings.speed_hist_size as usize {
-                    let hist_time = ClockSample::<Realtime>::now();
+                    let hist_time = Time::new(ClockId::Realtime);
                     if let Err(e) = fd.write_all(
                         format!(
                             "{},{},{},{}\n",

src/time.rs

@@ -2,42 +2,27 @@
 //
 // SPDX-License-Identifier: MPL-2.0
 
-use std::marker::PhantomData;
+use rustix::fs::Timespec;
-
 use rustix::time::{ClockId, clock_gettime};
 
-trait Clock {
+pub struct Time {
-    const ID: ClockId;
-}
-
-pub enum Realtime {}
-pub enum Monotonic {}
-
-impl Clock for Realtime {
-    const ID: ClockId = ClockId::Realtime;
-}
-
-impl Clock for Monotonic {
-    const ID: ClockId = ClockId::Monotonic;
-}
-
-pub struct ClockSample<C> {
     time_s: u64,
     time_ns: u64,
-    _clock: PhantomData<C>,
 }
 
-impl<C: Clock> ClockSample<C> {
+impl Time {
-    pub fn now() -> Self {
+    pub fn new(id: ClockId) -> Self {
-        let time = clock_gettime(C::ID);
+        let time: Timespec = clock_gettime(id);
-
         Self {
             time_s: time.tv_sec as u64,
             time_ns: time.tv_nsec as u64,
-            _clock: PhantomData,
         }
     }
 
+    pub fn get_time_since_midnight(&self) -> i64 {
+        (self.time_s as i64 % 86400 * 1000) + (self.time_ns as i64 / 1000000)
+    }
+
     pub fn secs(&self) -> u64 {
         self.time_s
     }
@@ -58,9 +43,3 @@ impl<C: Clock> ClockSample<C> {
         (self.time_s * 1000) + (self.time_ns / 1000000)
     }
 }
-
-impl ClockSample<Realtime> {
-    pub fn as_time_since_midnight(&self) -> i64 {
-        (self.time_s as i64 % 86_400 * 1000) + self.time_ns as i64 / 1_000_000
-    }
-}