Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion quest/m0/ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,5 @@ The historical samples locate candidates; they are not controlled benchmarks.
- [First shared FFI release](/quest/m0/ci/nightly-ffi-reuse.md) - condition: the backport merges and the next `moq-ffi-v*` tag runs `Release FFI`; verify the wrappers
- [Fewer BTreeMap instantiations](/quest/m0/ci/btree-keys.md) - moq-net shares BTreeMap key and value types, kept only if its CPU time drops
- [Halve the slowest tests' CPU](/quest/m0/ci/slow-tests.md) - the slowest 1% of tests take under half their 289 CPU-seconds, with coverage kept
- [Padding runs](/quest/m0/ci/quic-padding.md) - moq-quic parses a PADDING run as one frame, keeping the padding stats' meaning
- [tracing-test filter](/quest/m0/ci/tracing-filter.md) - moq-tokio's tests stop forcing every crate to format at TRACE
- [Stats oversize](/quest/m0/ci/stats-oversize.md) - moq-stats refuses an oversized plain snapshot before parsing it back
16 changes: 0 additions & 16 deletions quest/m0/ci/quic-padding.md

This file was deleted.

74 changes: 40 additions & 34 deletions rs/moq-quic/benches/wire.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,48 +119,54 @@ fn bench_encode(c: &mut Criterion<ThreadCpu>) {
}

/// Packet and frame decode: the server ingests forged packets of DATAGRAM frames, frames per
/// packet against packets. Only the ingest is timed.
/// packet against packets. `padded` is one small DATAGRAM frame with PADDING filling the rest of
/// the packet, as a padded Initial or MTU probe arrives. Only the ingest is timed.
fn bench_decode(c: &mut Criterion<ThreadCpu>) {
let mut group = c.benchmark_group("wire_decode");
let mut shapes = Vec::new();
for frames in [1, 16] {
let data = datagram(frames);
let mut body = BytesMut::new();
for _ in 0..frames {
datagram_frame(&mut body, &data);
}
shapes.push((format!("frames_{frames}"), frames, body));
}
let mut padded = BytesMut::new();
datagram_frame(&mut padded, &payload(1));
padded.resize(ROOM, 0);
shapes.push(("padded".to_string(), 1, padded));
for (shape, frames, body) in shapes {
for packets in [64, 1024] {
let mut state = None;
group.throughput(Throughput::Elements(packets as u64));
group.bench_function(
BenchmarkId::new(format!("frames_{frames}"), format!("packets_{packets}")),
|b| {
let (pair, forge, _) = state.get_or_insert_with(quiet);
let data = datagram(frames);
let mut body = BytesMut::new();
for _ in 0..frames {
datagram_frame(&mut body, &data);
}
b.iter_custom(|iters| {
let mut busy = Duration::ZERO;
for _ in 0..iters {
let forged: Vec<_> = (0..packets).map(|_| forge.packet(&body)).collect();
let start = ThreadTime::now();
for packet in forged {
deliver(pair, packet);
}
busy += start.elapsed();

let conn = pair.server.conn();
let mut received = 0;
while conn.datagrams().recv().is_some() {
received += 1;
}
assert_eq!(received, packets * frames, "server dropped datagrams");
group.bench_function(BenchmarkId::new(&shape, format!("packets_{packets}")), |b| {
let (pair, forge, _) = state.get_or_insert_with(quiet);
b.iter_custom(|iters| {
let mut busy = Duration::ZERO;
for _ in 0..iters {
let forged: Vec<_> = (0..packets).map(|_| forge.packet(&body)).collect();
let start = ThreadTime::now();
for packet in forged {
deliver(pair, packet);
}
busy += start.elapsed();

// Send the ACKs, which no forged packet acknowledges back.
let empty = conn.datagrams().send_buffer_space();
flush(pair, empty);
tick(pair);
let conn = pair.server.conn();
let mut received = 0;
while conn.datagrams().recv().is_some() {
received += 1;
}
busy
});
},
);
assert_eq!(received, packets * frames, "server dropped datagrams");

// Send the ACKs, which no forged packet acknowledges back.
let empty = conn.datagrams().send_buffer_space();
flush(pair, empty);
tick(pair);
}
busy
});
});
}
}
group.finish();
Expand Down
6 changes: 5 additions & 1 deletion rs/moq-quic/src/connection/mux/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,11 @@ impl Connection {
break;
};
let frame_len = before - payload.len();
frames += 1;
// A PADDING run decodes as one frame but is a frame per byte on the wire
frames += match frame {
wire::Frame::Quic(frame::Frame::Padding) => frame_len,
_ => 1,
};
if frames > 1 && !self.config.version.uses_records() {
return Err(TransportError::FRAME_ENCODING_ERROR(
"draft-00 message carries more than one frame",
Expand Down
12 changes: 12 additions & 0 deletions rs/moq-quic/src/connection/mux/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,18 @@ fn rejects_empty_records() {
);
}

#[test]
fn draft00_counts_each_padding_byte_as_a_frame() {
let mut pair = Pair::new(config(Version::QMux00));
pair.server.handle_record(Bytes::from_static(&[0x00]), pair.now);
assert!(!pair.server.is_closed());
pair.server.handle_record(Bytes::from_static(&[0x00, 0x00]), pair.now);
assert_eq!(
transport_error(&mut pair.server).code,
TransportErrorCode::FRAME_ENCODING_ERROR
);
}

#[test]
fn draft00_rejects_qx_ping() {
for ty in [0x348c67529ef8c7bd_u64, 0x348c67529ef8c7be] {
Expand Down
16 changes: 15 additions & 1 deletion rs/moq-quic/src/frame.rs
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,12 @@ impl Iter {
let ty = self.bytes.get::<FrameType>()?;
self.last_ty = Some(ty);
Ok(match ty {
FrameType::PADDING => Frame::Padding,
FrameType::PADDING => {
// Each zero byte is its own PADDING frame, so yield the whole run as one
let run = self.bytes.iter().position(|&b| b != 0).unwrap_or(self.bytes.len());
self.bytes.advance(run);
Frame::Padding
}
FrameType::RESET_STREAM => Frame::ResetStream(ResetStream {
id: self.bytes.get()?,
error_code: self.bytes.get()?,
Expand Down Expand Up @@ -985,6 +990,15 @@ mod test {
.unwrap()
}

#[test]
fn padding_runs_decode_as_one_frame() {
let mut iter = Iter::new(Bytes::from_static(&[0, 0, 0, 0x01, 0, 0])).unwrap();
assert_matches!(iter.next_with_size(), Some((Ok(Frame::Padding), 3)));
assert_matches!(iter.next_with_size(), Some((Ok(Frame::Ping), 1)));
assert_matches!(iter.next_with_size(), Some((Ok(Frame::Padding), 2)));
assert!(iter.next().is_none());
}

#[test]
fn application_close_coding() {
for &error_code in APPLICATION_ERROR_CODES {
Expand Down
Loading