Fix rumble freezes and clean up rumble #if hell - #945
Open
gheskett wants to merge 2 commits into
Open
Conversation
The rumble and game threads can both attempt to access the SI at the same time, which is no bueno.
gheskett
added
bug
gheskett
force-pushed
the
develop/2.4.0-rumble-fix-and-ifdef-cleanup
branch
4 times, most recently
from
August 16, 2026 08:11
be93186 to
2495a8e
Compare
gheskett
force-pushed
the
develop/2.4.0-rumble-fix-and-ifdef-cleanup
branch
from
August 16, 2026 08:13
2495a8e to
a4d1819
Compare
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
1 participant
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.
Rumble was seemingly failing because the rumble thread and game thread were potentially able to request access to the SI at the same time due to missing mutex blocks surrounding calls to
osMotorInitEx. This solution has also been tested against ultrasm64'sosMotorInitand works.I have enough confidence in this fix that we could consider re-enabling rumble by default, however I hesitate because I assume adding another thread would add a lot of extra performance overhead by default when (non-Shindou) vanilla SM64 doesn't use rumble anyway.