Mutex Deadlock fix: Track the fiber that owns a Mutex - #9649
Merged
headius merged 1 commit intoSep 8, 2026
Merged
Conversation
The deadlock check asked the owning thread's ThreadContext which fiber it was currently running. That answer is only right while the root fiber holds the lock. The reverse case is a fiber holding the lock while the root fiber tries to take it. There the check never fires, and Mutex#lock blocks forever instead of raising ThreadError. Store the owning fiber on the mutex instead. Unexcludes TestFiberMutex#test_mutex_deadlock.
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
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.
The
Mutexdeadlock check asked the owning thread'sThreadContextwhich fiber it was currently running. That answer is only right while the root fiber holds the lock. The reverse case is a fiber holding the lock while the root fiber tries to take it. There the check never fires, andMutex#lockblocks forever instead of raising ThreadError. Store the owning fiber on the mutex instead.Unexcludes
TestFiberMutex#test_mutex_deadlock.Sample code:
Master: hangs
This branch:
ThreadError: deadlock; lock already owned by another fiber belonging to the same thread