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
2 changes: 1 addition & 1 deletion quest/m1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ m4 default, so changes are proven before they ship: the
[QUIC Interop Runner](/quest/m1/quic-interop.md),
[sim rule checks](/quest/m1/quic-sim-rules.md),
[relay parser fuzz targets](/quest/m1/fuzz-relay-parsers.md), and from m4
[the relay on the sim](/quest/m1/quic-sim.md),
the relay on the sim (landed),
[mutation testing](/quest/m1/mutants.md), and
[peer-reachable unsafe](/quest/m1/wire-fuzz-coverage.md). OSS-Fuzz stays in m4 (maintainer, same round): it mostly waits on
google/oss-fuzz.
Expand Down
5 changes: 4 additions & 1 deletion quest/m1/quic-sim-rules.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,13 @@ Agent's choices, for the implementer to revisit:
such patch does not land.
- List the rules considered and left out, with the reason.
- The 64-case gate run must not slow measurably; say by how much it did.
- The relay and moq-tokio's `Client` and `Server` already run over moq-tokio's
`quic::driver::sim::Network` (`rs/moq-relay/tests/integration/quic_sim.rs`,
`rs/moq-tokio/tests/integration/sim_client.rs`), whose paths cross the
shared `Link`, so a checker there judges those runs too.

Public API: none. Wire: none.

## Related

- [QUIC Interop Runner](/quest/m1/quic-interop.md) - the same rules judged by other stacks
- [The relay over QUIC on the sim](/quest/m1/quic-sim.md) - its runs gain the checker through the shared `Link`
51 changes: 0 additions & 51 deletions quest/m1/quic-sim.md

This file was deleted.

8 changes: 4 additions & 4 deletions quest/m4/cluster-fault-schedules.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ Agent's choices, for the implementer to revisit:
- Prove the harness finds things: `test/drill/mutations`'s patches, applied
one at a time, must each fail some seed within the nightly budget. Report
which do not, since those are the drills this cannot replace.
- Build on `rs/moq-relay/tests/integration/quic_sim.rs`: a relay serves a
moq-tokio `Server` whose `server::Config::sim` binds it on a
`quic::driver::sim::Host`, peers dial through `cluster::Options::sim`, and
clients through `client::Config::sim`, all on one `Network`.
- No turmoil or madsim: `kio::clock::sim` and `moq_quic::sim` already give a
seeded scheduler and network with no shims.

Public API: none. Wire: none.

## Required

- [The relay over QUIC on the sim](/quest/m1/quic-sim.md) - relays and clients on one simulated `Network`

## Related

- [Sim rule checks](/quest/m1/quic-sim-rules.md) - QUIC's rules checked on the same runs
Expand Down
4 changes: 0 additions & 4 deletions quest/m4/quic-realtime.md
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,3 @@ through `bandwidth_estimate` → `estimated_send_rate` → `set_bitrate`.
the upstream encoder, so a GStreamer pipeline at a fixed bitrate still queues
when capacity drops; [its own quest](/quest/m4/moqsink-feedback.md)
owns that feedback. The bake-off and shipping `Realtime` do not wait on it.

## Related

- [QUIC on the sim](/quest/m1/quic-sim.md) - deterministic successor to the moq-shaper harness once it lands
4 changes: 0 additions & 4 deletions quest/m4/quic-sim-mtu.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,3 @@ fixed by [moq-dev/moq#7429](https://github.com/moq-dev/moq/pull/7429), and the 0
report is moot ([0-RTT leftovers](https://github.com/moq-dev/moq/pull/7492)).

Public API: none (test harness only). Wire: none.

## Related

- [QUIC on the sim](/quest/m1/quic-sim.md) - reuses this `Pair` for MoQ sessions
1 change: 0 additions & 1 deletion quest/m5/bench-transport-sweep.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,3 @@ Public API: none. Wire: none.
## Related

- [Benchmark sources](/quest/m4/bench-sources.md) - feeds these series into the regression table
- [QUIC on the sim](/quest/m1/quic-sim.md) - an in-memory QUIC link the sweep could reuse
3 changes: 2 additions & 1 deletion rs/moq-relay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ doc = false

[features]
# A programmatic relay fixture with generated TLS and ephemeral ports, and
# `cluster::Options::network`, which routes peer dials over in-memory links.
# `cluster::Options::network`, which routes peer dials over in-memory links, and with
# `quic`, `cluster::Options::sim`, which binds them on a simulated QUIC host.
test-support = ["moq-tokio/sim"]
# The optional public STUN Binding listener (`--stun-bind`).
stun = ["dep:stun-types"]
Expand Down
21 changes: 20 additions & 1 deletion rs/moq-relay/src/cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,11 @@ pub struct Options {
/// `None` dials over sockets.
#[cfg(feature = "test-support")]
pub network: Option<moq_tokio::sim::Network>,

/// The simulated host peer dials bind on, for tests over QUIC on `kio::clock::sim`;
/// see [`moq_tokio::client::Config::sim`]. `None` binds UDP sockets.
#[cfg(all(feature = "test-support", feature = "quic"))]
pub sim: Option<moq_tokio::quic::driver::sim::Host>,
}

impl Options {
Expand Down Expand Up @@ -1321,6 +1326,9 @@ pub struct Cluster {
/// Where peer dials go in place of the network; see [`Options::network`].
#[cfg(feature = "test-support")]
network: Option<moq_tokio::sim::Network>,
/// The simulated host peer dials bind on; see [`Options::sim`].
#[cfg(all(feature = "test-support", feature = "quic"))]
sim: Option<moq_tokio::quic::driver::sim::Host>,
/// The client static and API peers share when the template binds a fixed
/// `[connect]` port, so that port stays the cluster's egress port. Otherwise
/// `None`, and every session builds its own client on an ephemeral port. Built
Expand Down Expand Up @@ -1443,6 +1451,8 @@ impl Cluster {
stats,
#[cfg(feature = "test-support")]
network,
#[cfg(all(feature = "test-support", feature = "quic"))]
sim,
} = options;
let deprecated = config.deprecated();
anyhow::ensure!(deprecated.is_empty(), "{deprecated}");
Expand Down Expand Up @@ -1500,6 +1510,8 @@ impl Cluster {
quic: None,
#[cfg(feature = "test-support")]
network,
#[cfg(all(feature = "test-support", feature = "quic"))]
sim,
dial: None,
dialers: Dialers::new(),
advertise: None,
Expand Down Expand Up @@ -2350,7 +2362,14 @@ impl Cluster {
}
let mut quic = self.quic.as_deref().cloned().unwrap_or_default();
self.peer_quic.dial(&mut quic);
let client = connect.init(quic)?;
let mut config = moq_tokio::client::Config::default();
config.connect = connect;
config.quic = quic;
#[cfg(all(feature = "test-support", feature = "quic"))]
{
config.sim = self.sim.clone();
}
let client = config.init()?;
#[cfg(feature = "test-support")]
let client = match &self.network {
Some(network) => client.with_network(network.clone()),
Expand Down
2 changes: 2 additions & 0 deletions rs/moq-relay/tests/integration/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ mod logs;
mod memory;
mod peer_limits;
mod public_rules;
#[cfg(all(feature = "test-support", feature = "quic"))]
mod quic_sim;
mod refusals;
mod released_cli;
mod runtime_uring;
Expand Down
Loading