[Tokio migration] Refactor AudioFileFetch #658
Merged
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
Johannesd3
force-pushed
the
refactor-audio-file-fetch
branch
2 times, most recently
from
6a9f295 to
325bc18
Compare
|
There is a bigger question as to what we're going to do with audio file fetching in the long term. I'm part way through writing up some of the changes and moves away from Hermes to HTTP, and part of that is the move to the CDN, which pretty much every Spotify client uses now. |
Johannesd3
force-pushed
the
refactor-audio-file-fetch
branch
from
325bc18 to
3dcbe9d
Compare
Previously, polling `AudioFileFetch` consisted of three parts: Handling stream loader commands, handling received data, and triggering preloading in stream mode when the number of open requests is sufficiently small. The first steps use channels which are polled, and if something's available, it's handled. The third step is executed on every call of `poll`. The first two could easily be refactored using a `tokio::select!`-loop. Therefore, counting the number of open requests was also refactored to fit into this scheme. They were previously counted using a shared `AtomicUsize`. Now, the number of open requests is stored exclusively in `AudioFileFetch`, increased on starting a request, and decreased by an oneshot channel that is fired when a request is finished. This allows us to `select` that channel in the loop too, and since loading ahead makes only sense if the number of open requests decreases, the third step is only executed in this case. `AudioFileFetch` does not implement `Future` anymore, but is rather used as helper struct in an async fn `audio_file_fetch`.
Johannesd3
force-pushed
the
refactor-audio-file-fetch
branch
from
3dcbe9d to
ca255c1
Compare
|
We'll merge this for now, as it is neater nonetheless. |
This was referenced Apr 13, 2021
Merged
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.
Refactors
AudioFileFetchusingasync/await(more details in the commit message). Furthermore,fetch.rswas split in two files.