Port cl/361876089: JniRunnable: Fix a deadlock when Detach() is called from Run() #330
Conversation
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
dconeybe
force-pushed
the
dconeybe/PortChangelist361876089
branch
from
5e3707a to
e54d571
Compare
schmidt-sebastian
approved these changes
Mar 18, 2021
dconeybe
added a commit
that referenced
this pull request
Mar 30, 2021
…lled from Run() This changelist was previously ported in #330 but the integration testing component was lost in a merge.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This is a port of cl/361876089:
JniRunnable: Fix a deadlock when Detach() is called from Run().
The deadlock occurred because Detach() attempted to acquire a write lock on a ReentrantReadWriteLock, which waits for all read locks to first be released; however, the Run() invocation on the call stack holds one of these read locks and therefore the read lock count will never reach zero causing the acquisition of the write lock to block forever.
This fix replaces the ReentrantReadWriteLock with standard Java synchronization. This implementation has the limitation that concurrent invocations of
run()will be serialized with the advantage of a simple implementation. A more complicated version that allows concurrent invocations ofrun()is in a previous commit in this PR and is also recorded at https://gist.github.com/dconeybe/2d95fbc75f88de58a49804df5c55157b for potential future use.