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
16 changes: 12 additions & 4 deletions quest/m2/multicast/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,18 @@ The maintainer's requirements, which every child is judged against:
moq-transport node is always an endpoint.
12. No global view. With competing claims each node uses its closest, and
nothing elects a leader.
Narrowed 2026-11-18 inside one trusted domain, for judging
[the node layer](/quest/m3/node-layer.md): a node may know its domain's
topology, but nothing elects a leader and competing claims resolve to
the closest.
Narrowed 2026-11-18 inside one trusted domain, for judging node layers
under MoQ: a node may know its domain's topology, but nothing elects a
leader and competing claims resolve to the closest. The node-layer
bake-off ([moq-dev/moq#9149](https://github.com/moq-dev/moq/pull/9149))
kept the path vector: link state sent more route messages on every link
or relay failure but a 12-relay partition (up to 60 times at 32 relays;
a publisher moving costs it claim floods, not route messages), with fewer readers unfed after a partition or a hub dying
slowly but more after a transit dies, and held fewer copies of each
claim. A flat domain over a network that routes underneath sends nothing
for link events that network absorbs, but notices a partition only by
keep-alives and fans out only with warm routes across every pair of
relays.
13. A secondary route may carry metadata only, so a stalled primary is found
without waiting on QUIC keep-alives, where a node opts in.
14. No approach is assumed: earlier attempts are evidence, not constraints.
Expand Down
122 changes: 0 additions & 122 deletions quest/m3/node-layer.md

This file was deleted.

2 changes: 1 addition & 1 deletion rs/moq-net/src/route/tests/bakeoff.rs
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ fn quiesce(net: &mut MultiSim) {
fn tune(arm: Arm) -> multi::Tune {
match arm {
Arm::Multi(tune) => tune,
Arm::Relay(_) => panic!("not the prototype"),
Arm::Relay(_) | Arm::Layer(_) => panic!("not the prototype"),
}
}

Expand Down
14 changes: 14 additions & 0 deletions rs/moq-net/src/route/tests/compare.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ pub(super) enum Arm {
/// [`relay::Router`]: the rule [`Self::KEPT`] measures, as it ships, its readers
/// showing a lost claim unavailable for this long before offline.
Relay(Duration),
/// A node layer under MoQ ([`super::node_layer`]).
Layer(super::node_layer::Layer),
}

impl Arm {
Expand Down Expand Up @@ -86,6 +88,8 @@ impl Arm {
Self::Multi(tune) => tune,
Self::Relay(debounce) if debounce.is_zero() => return "relay-undebounced".into(),
Self::Relay(_) => return "relay".into(),
Self::Layer(super::node_layer::Layer::LinkState) => return "link-state".into(),
Self::Layer(super::node_layer::Layer::Flat) => return "flat".into(),
};
let parts = [
(tune.suspect == Suspect::Flagged, "+suspect"),
Expand All @@ -105,6 +109,7 @@ impl Arm {
match self {
Self::Multi(tune) => Box::new(MultiSim::new(tune, nodes)),
Self::Relay(debounce) => Box::new(RelaySim::new(nodes, debounce)),
Self::Layer(layer) => Box::new(super::node_layer::LayerSim::new(layer, nodes)),
}
}
}
Expand Down Expand Up @@ -199,6 +204,9 @@ pub(super) trait Net {
/// The queues with something to deliver, and how much.
fn ready(&self) -> Vec<(Chan, usize)>;
fn step(&mut self, chan: Chan);
/// Send what the changes since the last round left batched, before the next
/// round delivers.
fn flush(&mut self) {}
/// One hop of delay passes. Whether a timer still runs.
fn tick(&mut self) -> bool {
false
Expand All @@ -207,6 +215,11 @@ pub(super) trait Net {
/// ended at the publisher: `None` with no route. A chain longer than the network
/// loops.
fn chase(&self, from: Node, id: Id) -> Option<(Vec<Node>, bool)>;
/// The nodes a pull from `from` for publisher `id` takes its data from, in [`Self::chase`]'s
/// form: every hop where each relay carries what it forwards.
fn pulls(&self, from: Node, id: Id) -> Option<(Vec<Node>, bool)> {
self.chase(from, id)
}
fn showing(&self, node: Node, id: Id, claim: &str) -> Option<bool>;
fn sent(&self) -> Sent;
fn held(&self) -> Held;
Expand Down Expand Up @@ -633,6 +646,7 @@ impl Lab {
/// Deliver everything queued now: one hop of delay. False if nothing was and no
/// timer runs.
pub fn round(&mut self) -> bool {
self.net.flush();
let mut ready = self.net.ready();
if ready.is_empty() && !self.net.tick() && self.net.ready().is_empty() {
return false;
Expand Down
1 change: 1 addition & 0 deletions rs/moq-net/src/route/tests/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ mod multi;
mod multicast;
mod multicast_cost;
mod multicast_search;
mod node_layer;
mod sticky;
mod warm;
mod warmth;
Expand Down
Loading