Skip to content

Commit ce5a6b7

Browse files
authored
refactor(s2n-quic-sim): replace unmaintained humantime library with jiff (#2532)
1 parent e1e80bd commit ce5a6b7

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

quic/s2n-quic-sim/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ publish = false
1414
anyhow = "1"
1515
bytes = "1"
1616
bolero-generator = "0.13.0"
17-
humantime = "2"
1817
indicatif = { version = "0.17", features = ["rayon"] }
18+
jiff = "0.2"
1919
once_cell = "1"
2020
prost = "0.13"
2121
rand = "0.9"

quic/s2n-quic-sim/src/run/config.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
use super::CliRange;
5-
use humantime::Duration;
5+
use jiff::SignedDuration;
66
use serde::Deserialize;
77
use structopt::StructOpt;
88

@@ -57,15 +57,15 @@ config!(
5757

5858
#[name = "jitter"]
5959
#[default = "0ms"]
60-
jitter: CliRange<Duration>,
60+
jitter: CliRange<SignedDuration>,
6161

6262
#[name = "network_jitter"]
6363
#[default = "0ms"]
64-
network_jitter: CliRange<Duration>,
64+
network_jitter: CliRange<SignedDuration>,
6565

6666
#[name = "delay"]
6767
#[default = "100ms"]
68-
delay: CliRange<Duration>,
68+
delay: CliRange<SignedDuration>,
6969

7070
#[name = "transmit_rate"]
7171
#[default = "0"]
@@ -85,7 +85,7 @@ config!(
8585

8686
#[name = "inflight_delay"]
8787
#[default = "0ms"]
88-
inflight_delay: CliRange<Duration>,
88+
inflight_delay: CliRange<SignedDuration>,
8989

9090
#[name = "inflight_delay_threshold"]
9191
#[default = "0"]
@@ -101,7 +101,7 @@ config!(
101101

102102
#[name = "connect_delay"]
103103
#[default = "0ms"]
104-
connect_delay: CliRange<Duration>,
104+
connect_delay: CliRange<SignedDuration>,
105105

106106
#[name = "connections"]
107107
#[default = "1"]

quic/s2n-quic-sim/src/run/endpoint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub fn client(
4444
events: events::Events,
4545
servers: &[SocketAddr],
4646
count: usize,
47-
delay: CliRange<humantime::Duration>,
47+
delay: CliRange<jiff::SignedDuration>,
4848
streams: CliRange<u32>,
4949
stream_data: CliRange<u64>,
5050
) -> Result {

quic/s2n-quic-sim/src/run/range.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
use core::{fmt, marker::PhantomData, str::FromStr, time::Duration};
5+
use jiff::SignedDuration;
56
use s2n_quic::provider::io::testing::rand;
67
use serde::Deserialize;
78

@@ -26,11 +27,11 @@ impl Default for CliRange<u64> {
2627
}
2728
}
2829

29-
impl Default for CliRange<humantime::Duration> {
30+
impl Default for CliRange<jiff::SignedDuration> {
3031
fn default() -> Self {
3132
Self {
32-
start: Duration::ZERO.into(),
33-
end: Duration::ZERO.into(),
33+
start: SignedDuration::ZERO,
34+
end: SignedDuration::ZERO,
3435
}
3536
}
3637
}
@@ -58,7 +59,7 @@ where
5859
}
5960
}
6061

61-
impl CliRange<humantime::Duration> {
62+
impl CliRange<jiff::SignedDuration> {
6263
pub fn gen_duration(&self) -> Duration {
6364
let start = self.start.as_nanos();
6465
let end = self.end.as_nanos();

quic/s2n-quic-sim/src/stats.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ impl Type {
405405
}
406406
}
407407
Self::Duration => {
408-
if let Ok(v) = value.parse::<humantime::Duration>() {
408+
if let Ok(v) = value.parse::<jiff::SignedDuration>() {
409409
Ok(v.as_secs_f64())
410410
} else {
411411
Ok(value.parse()?)

0 commit comments

Comments
 (0)