Skip to content
Merged
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
54 changes: 47 additions & 7 deletions rs/moq-net/src/model/resume_model.rs
Original file line number Diff line number Diff line change
Expand Up @@ -398,13 +398,13 @@ impl Model {
if copy.complete(group) || !copy.given_up.insert(group) {
return Ok(());
}
match copy.groups.get_mut(&group) {
Some(parts) => {
for writer in parts.iter_mut().filter_map(|part| part.writer.take()) {
let _ = writer.abort(Error::Stream(GIVE_UP));
}
}
None => copy.track.drop_groups(group..group + 1, GIVE_UP),
let parts = copy.groups.get_mut(&group).map(Vec::as_mut_slice).unwrap_or_default();
for writer in parts.iter_mut().filter_map(|part| part.writer.take()) {
let _ = writer.abort(Error::Stream(GIVE_UP));
}
// A fetched tail is not the live feed's: the feed reports the group dropped.
if !parts.iter().any(|part| part.from == 0) {
copy.track.drop_groups(group..group + 1, GIVE_UP);
}
publisher.given_up.insert(group);
}
Expand Down Expand Up @@ -1364,6 +1364,46 @@ fn regressions() {
],
finish: false,
},
// A route giving up a group it held only a fetched tail of drops it from its live
// feed, so an ordered read on that route moves past it.
Case {
ops: vec![
Op::Up { instance: 1, slot: 0 },
Op::Join {
reader: 1,
spec: spec(false, Budget::Hour, None, false),
},
Op::Write {
instance: 1,
slot: 0,
group: None,
frames: 1,
},
Op::Up { instance: 1, slot: 1 },
Op::Join {
reader: 0,
spec: spec(true, Budget::Hour, None, false),
},
Op::Write {
instance: 1,
slot: 0,
group: Some(5),
frames: 1,
},
Op::Write {
instance: 1,
slot: 1,
group: None,
frames: 1,
},
Op::GiveUp {
instance: 1,
slot: 1,
group: 5,
},
],
finish: false,
},
];
for case in cases {
if let Err(err) = run(&case) {
Expand Down