Repository navigation
Avoid enqueueing the deterministic sound poll timer twice - #232
Merged
Merged
Conversation
Solarian II repeatedly restarts sound DMA without the stream being closed, and thus we would end up in `SoundServer::start_out_stream` without going through `close_out_stream`. The `add_cyclic_timer` did call did not check if the timer was already active, and we would end up with a duplicate entry in the timer queue, which slowdowns and other incorrect behavior. Fixed by checking the `active` flag, like all of the other callsites.
With the shared `TimerInfo` structs refactor from 529fff7, it's easier to accidentally enqueue the same timer multiple twice. Help the the programmer out by logging an error if the timer is already `active` when adding it. To also reduce the boilerplate, one-shot timers and and cancellation automatically clear the flag. The error could be upgraded to a CHECK_F once we're more confident that we've fixed all of the callsites.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Solarian II repeatedly restarts sound DMA without the stream being closed, and thus we would end up in
SoundServer::start_out_streamwithout going throughclose_out_stream. Theadd_cyclic_timerdid call did not check if the timer was already active, and we would end up with a duplicate entry in the timer queue, which slowdowns and other incorrect behavior.Fixed by checking the
activeflag, like all of the other callsites.This is partly due to the shared
TimerInfostructs refactor from 529fff7 – it's easier to accidentally enqueue the same timer multiple twice. Help the the programmer out by logging an error if the timer is alreadyactivewhen adding it. To also reduce the boilerplate, one-shot timers and and cancellation automatically clear the flag.The error could be upgraded to a
CHECK_Fonce we're more confident that we've fixed all of the callsites.