Repository navigation
fix(moq-c): cancel every consumer before its subscription is accepted #7385
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6bba2e9
chore(quest): claim quest/m1/c/consumer-cancel.md
kixelated 8d4cf9b
fix(moq-c): cancel every consumer before its subscription is accepted
kixelated fac1dcd
fix(moq-c): keep the invalid-broadcast catalog test as it was
kixelated fe247a9
Merge base and preserve consumer cancellation with media delay settings
aaceab3
Merge remote-tracking branch 'origin/main' into worktree-agent-a17a62…
kixelated dfdf13a
fix(moq-c): pass a moq_delay pointer in the media cancel test
kixelated 5d28d22
Merge origin/main into quest/m1/c/consumer-cancel
kixelated File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Script executed:
rg -n 'pub fn consume\(|Consumer::new\(|consumer_tasks|fn watch\(' rs/moq-c/src/{audio,video,ffi}.rsRepository: moq-dev/moq
Length of output: 1018
Script executed:
Repository: moq-dev/moq
Length of output: 42962
Script executed:
Repository: moq-dev/moq
Length of output: 19234
Script executed:
Repository: moq-dev/moq
Length of output: 14042
Script executed:
Repository: moq-dev/moq
Length of output: 8927
Script executed:
Repository: moq-dev/moq
Length of output: 5815
Race decoder subscription setup against cancel.
moq_decode_audio_cancelandmoq_decode_video_cancelonly signal the task. The task still awaitsdecode::Consumer::new, which waits for SUBSCRIBE_OK, and nothing checks the close signal during that wait. While the subscription is pending, cancel returns0but the terminal callback does not fire, souser_datacannot be released. Race the constructor against the close signal, as the track path does withuntil_closed. That helper is private toconsume.rs, so it needspub(crate)visibility beforeaudio.rsandvideo.rscan use it. The PR title says every consumer is fixed, andmedia_consumers_cancel_while_subscribingcovers onlymoq_consume_videoandmoq_consume_audio.