Fix deadlock between BroadcastFrameClock.lock and Recomposer.stateLock
#2098
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
igordmn
force-pushed
the
igor.demin/deadlock-cherry-pick
branch
from
ab55da5 to
2ab33b0
Compare
In the referenced bug, there's a deadlock where a call to `withFrameNanos` is being canceled on one thread while another thread is dispatching another thread. To avoid the deadlock, this commit updates the BroadcastFrameClock awaiter so that it's possible to cancel an awaiter without acquiring any locks. Fixes: b/407027032 Test: BroadcastFrameClockTest.locklessCancellation Relnote: "Fixed a deadlock that may affect Molecule users when a suspended call to `FrameClock.withFrameNanos` is cancelled while a frame is being dispatched." Change-Id: I89cab8e3eab14ed9a85b36e151f11b5f526a01fd
igordmn
force-pushed
the
igor.demin/deadlock-cherry-pick
branch
from
2ab33b0 to
67c7a07
Compare
igordmn
force-pushed
the
igor.demin/deadlock-cherry-pick
branch
from
67c7a07 to
7480a26
Compare
pjBooms
approved these changes
May 12, 2025
Kpotko
approved these changes
May 12, 2025
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.
Cherry-pick of https://android-review.googlesource.com/c/platform/frameworks/support/+/3586997
Besides cherry-pick, additional code added in the second commit.
Fixes https://youtrack.jetbrains.com/issue/CMP-7879/Cherry-pick-a-hotfix-for-deadlock-between-BroadcastFrameClock.lock-and-Recomposer.stateLock
Release Notes
Fixes - Desktop
BroadcastFrameClock.lockandRecomposer.stateLock