Cancel MediaRelay's consumer task when the last proxy is stopped #919
Conversation
This file contains 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
jlaine
reviewed
Oct 25, 2023
src/aiortc/contrib/media.py
Outdated
| @@ -578,6 +578,10 @@ def _stop(self, proxy: RelayStreamTrack) -> None: | |||
| # unregister proxy | |||
| self.__log_debug("Stop proxy %s", id(proxy)) | |||
| self.__proxies[track].discard(proxy) | |||
| if len(self.__proxies[track]) == 0 and track in self.__tasks: | |||
| self.__tasks[track].cancel() | |||
| del self.__tasks[track] | |||
There was a problem hiding this comment.
I'd rather have the un-registration happen in a single place. Couldn't we handle cancellation in __run_track?
|
This looks interesting but I don't see the corresponding unit test? |
jlaine
added
the
changes requested
whitphx
force-pushed
the
stop-relay-when-no-proxy
branch
from
01b49c1
to
5f0e87c
Compare
jlaine
reviewed
Nov 30, 2023
| @@ -578,18 +578,24 @@ def _stop(self, proxy: RelayStreamTrack) -> None: | |||
| # unregister proxy | |||
| self.__log_debug("Stop proxy %s", id(proxy)) | |||
| self.__proxies[track].discard(proxy) | |||
| if len(self.__proxies[track]) == 0 and track in self.__tasks: | |||
There was a problem hiding this comment.
Suggested change
| if len(self.__proxies[track]) == 0 and track in self.__tasks: | |
| # stop worker if this was the last proxy | |
| if not self.__proxies[track] and track in self.__tasks: |
There was a problem hiding this comment.
How can track not be in self.__tasks ?
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #919 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 30 30
Lines 5816 5824 +8
=========================================
+ Hits 5816 5824 +8 ☔ View full report in Codecov by Sentry. |
|
One thing I'm wondering about: if you stop all the consumer, isn't data just going to build up indefinitely in the source track? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Stop the
MediaRelay.__run_track()task when all the downstream relay tracks are stopped.This is kind of optimization, not a bug fix.