Lochnair-Labs/irtt-rs
2
0 Fork 0
Code Issues 1 Pull Requests 4 Actions 4 Packages Projects Releases 6 Wiki Activity

fix(client): handle negative RTT and simplify sample generation

Browse Source
This commit is contained in:
Nils Andreas Svee committed 2026-04-28 22:45:03 +07:00
1 parent 8ae849b2db
commit a51274d6b6
1 file changed
+35 -35
Download Patch File Download Diff File Expand all files Collapse all files
crates/irtt-client/src/client.rs
+35 -35
View File
@@ -373,35 +373,33 @@ impl Client {
session.completed.insert(wire_seq, pending.logical_seq); session.completed.insert(wire_seq, pending.logical_seq);
let mut events = Vec::new(); let mut events = Vec::new();
if let Some(rtt_sample) = rtt { if is_late {
if is_late { events.push(ClientEvent::LateReply {
events.push(ClientEvent::LateReply { seq: wire_seq,
seq: wire_seq, logical_seq: Some(pending.logical_seq),
logical_seq: Some(pending.logical_seq), highest_seen,
highest_seen, remote: self.remote,
remote: self.remote, sent_at: Some(pending.sent_at),
sent_at: Some(pending.sent_at), received_at: now,
received_at: now, rtt: Some(rtt),
rtt: Some(rtt_sample), server_timing,
server_timing, one_way,
one_way, received_stats,
received_stats, packet_meta: PacketMeta::default(),
packet_meta: PacketMeta::default(), });
}); } else {
} else { events.push(ClientEvent::EchoReply {
events.push(ClientEvent::EchoReply { seq: wire_seq,
seq: wire_seq, logical_seq: pending.logical_seq,
logical_seq: pending.logical_seq, remote: self.remote,
remote: self.remote, sent_at: pending.sent_at,
sent_at: pending.sent_at, received_at: now,
received_at: now, rtt,
rtt: rtt_sample, server_timing,
server_timing, one_way,
one_way, received_stats,
received_stats, packet_meta: PacketMeta::default(),
packet_meta: PacketMeta::default(), });
});
}
} }
Ok(events) Ok(events)
} else if session.completed.contains(wire_seq) { } else if session.completed.contains(wire_seq) {
@@ -564,8 +562,11 @@ fn compute_rtt(
sent_at: &ClientTimestamp, sent_at: &ClientTimestamp,
received_at: &ClientTimestamp, received_at: &ClientTimestamp,
ts: &TimestampFields, ts: &TimestampFields,
) -> Option<RttSample> { ) -> RttSample {
let raw = received_at.mono.checked_duration_since(sent_at.mono)?; let raw = received_at
.mono
.checked_duration_since(sent_at.mono)
.unwrap_or(Duration::ZERO);
let server_processing = compute_server_processing(ts); let server_processing = compute_server_processing(ts);
@@ -573,11 +574,11 @@ fn compute_rtt(
let effective = adjusted.unwrap_or(raw); let effective = adjusted.unwrap_or(raw);
Some(RttSample { RttSample {
raw, raw,
adjusted, adjusted,
effective, effective,
}) }
} }
fn compute_server_processing(ts: &TimestampFields) -> Option<Duration> { fn compute_server_processing(ts: &TimestampFields) -> Option<Duration> {
@@ -1718,8 +1719,7 @@ mod tests {
send_mono: Some(1_000_000_000), send_mono: Some(1_000_000_000),
..Default::default() ..Default::default()
}, },
) );
.unwrap();
assert!(rtt.adjusted.is_none()); assert!(rtt.adjusted.is_none());
assert_eq!(rtt.effective, rtt.raw); assert_eq!(rtt.effective, rtt.raw);
} }