Skip to content

Adding minor trait to delay per-packet config #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BobAnkh merged 1 commit into from
Jun 17, 2025
Merged

Adding minor trait to delay per-packet config #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions src/model/delay_per_packet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const DEFAULT_RNG_SEED: u64 = 42; // Some documentation will need corrections if
/// separate the configuration part into a simple struct for serialization/deserialization, and
/// construct the model from the configuration.
#[cfg_attr(feature = "serde", typetag::serde)]
pub trait DelayPerPacketTraceConfig: DynClone + Send {
pub trait DelayPerPacketTraceConfig: DynClone + Send + std::fmt::Debug {
fn into_model(self: Box<Self>) -> Box<dyn DelayPerPacketTrace>;
}

Expand Down Expand Up @@ -100,7 +100,7 @@ use super::solve_truncate::solve;
/// assert_eq!(static_delay.next_delay(), Some(Delay::from_millis(10)));
/// assert_eq!(static_delay.next_delay(), None);
/// ```
#[derive(Debug, Clone)]
#[derive(Default, Debug, Clone, Copy, PartialEq)]
pub struct StaticDelayPerPacket {
pub delay: Delay,
pub count: usize,
Expand All @@ -111,7 +111,7 @@ pub struct StaticDelayPerPacket {
///
/// See [`StaticDelayPerPacket`] for more details.
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(default))]
#[derive(Debug, Clone, Default)]
#[derive(Default, Debug, Clone, Copy, PartialEq)]
pub struct StaticDelayPerPacketConfig {
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
#[cfg_attr(
Expand Down Expand Up @@ -191,6 +191,7 @@ pub struct StaticDelayPerPacketConfig {
/// let json_str = "{\"RepeatedDelayPerPacketPatternConfig\":{\"pattern\":[{\"StaticDelayPerPacketConfig\":{\"delay\":{\"secs\":0,\"nanos\":10000000},\"count\":1}},{\"StaticDelayPerPacketConfig\":{\"delay\":{\"secs\":0,\"nanos\":20000000},\"count\":1}}],\"count\":2}}";
/// assert_eq!(ser_str, json_str);
/// ```
#[derive(Default)]
pub struct RepeatedDelayPerPacketPattern {
pub pattern: Vec<Box<dyn DelayPerPacketTraceConfig>>,
pub count: usize,
Expand All @@ -203,7 +204,7 @@ pub struct RepeatedDelayPerPacketPattern {
///
/// See [`RepeatedDelayPerPacketPattern`] for more details.
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(default))]
#[derive(Default, Clone)]
#[derive(Default, Debug, Clone)]
pub struct RepeatedDelayPerPacketPatternConfig {
pub pattern: Vec<Box<dyn DelayPerPacketTraceConfig>>,
pub count: usize,
Expand Down Expand Up @@ -250,7 +251,7 @@ pub struct RepeatedDelayPerPacketPatternConfig {
/// assert_eq!(normal_delay.next_delay(), Some(Delay::from_nanos(12100000)));
/// assert_eq!(normal_delay.next_delay(), None);
/// ```
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Copy, PartialEq)]
pub struct NormalizedDelayPerPacket<Rng = StdRng>
where
Rng: RngCore,
Expand All @@ -270,7 +271,7 @@ where
///
/// See [`NormalizedDelayPerPacket`] for more details.
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(default))]
#[derive(Debug, Clone, Default)]
#[derive(Default, Debug, Clone, Copy, PartialEq)]
pub struct NormalizedDelayPerPacketConfig {
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
#[cfg_attr(
Expand Down Expand Up @@ -344,7 +345,7 @@ pub struct NormalizedDelayPerPacketConfig {
/// assert_eq!(log_normal_delay.next_delay(), Some(Delay::from_nanos(12100000)));
/// assert_eq!(log_normal_delay.next_delay(), None);
/// ```
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Copy, PartialEq)]
pub struct LogNormalizedDelayPerPacket<Rng = StdRng>
where
Rng: RngCore,
Expand All @@ -364,7 +365,7 @@ where
///
/// See [`LogNormalizedDelayPerPacket`] for more details.
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(default))]
#[derive(Debug, Clone, Default)]
#[derive(Default, Debug, Clone, Copy, PartialEq)]
pub struct LogNormalizedDelayPerPacketConfig {
#[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))]
#[cfg_attr(
Expand Down Expand Up @@ -901,6 +902,12 @@ impl_delay_per_packet_trace_config!(NormalizedDelayPerPacketConfig);
impl_delay_per_packet_trace_config!(LogNormalizedDelayPerPacketConfig);
impl_delay_per_packet_trace_config!(RepeatedDelayPerPacketPatternConfig);

impl<Model: DelayPerPacketTrace + 'static> From<Model> for Box<dyn DelayPerPacketTrace> {
fn from(model: Model) -> Self {
Box::new(model)
}
}

/// Turn a [`DelayPerPacketTraceConfig`] into a forever repeated [`RepeatedDelayPerPacketPatternConfig`].
pub trait Forever: DelayPerPacketTraceConfig {
fn forever(self) -> RepeatedDelayPerPacketPatternConfig;
Expand Down
Loading