mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Fix deadlock in AnimationBackendChoreographer
Summary:
scheduleCallback() and pause() held synchronized(paused) while calling
ReactChoreographer.postFrameCallback/removeFrameCallback, which acquire
synchronized(callbackQueues). ReactChoreographer dispatches frame
callbacks inside synchronized(callbackQueues), invoking
executeFrameCallback -> scheduleCallback -> synchronized(paused).
This is a lock ordering inversion: background thread acquires paused
then callbackQueues, main thread acquires callbackQueues then paused.
Fix: move postFrameCallback/removeFrameCallback calls outside the
synchronized(paused) block. The atomic state check (paused +
callbackPosted) stays inside the lock, only the ReactChoreographer
interaction moves outside.
Why this is safe:
- callbackPosted.getAndSet(true) inside the lock guarantees at most one
thread proceeds to post. A concurrent scheduleCallback will see
callbackPosted=true and bail out.
- If pause() runs between the lock release and postFrameCallback:
pause sets paused=true and callbackPosted=false, then calls
removeFrameCallback. Two outcomes depending on ordering inside
callbackQueues (which serializes both calls):
(a) post runs first, then remove cancels it — clean.
(b) remove runs first (nothing to remove), then post adds a callback.
That callback fires once, executeFrameCallback sees paused=true
via scheduleCallback and does not re-post. Net effect: one extra
no-op frame, then the loop stops.
- resume() already operated without synchronized(paused) before this
change, so no new races are introduced on that path.
## Changelog:
[Android] [Changed] - AnimationBackendChoreographer doesn't guard the ReactChoreographer post/remove with synchronized(paused)
Reviewed By: zeyap
Differential Revision: D99099455
fbshipit-source-id: 5c5e9e76ec23fd300a0a67c98b70a9c5bdb08f30
This commit is contained in:
1 parent
bf277cb6d4
commit
22d327595d
1 file changed
+15
-13
+15
-13
@@ -46,24 +46,26 @@ internal class AnimationBackendChoreographer(
|
||||
}
|
||||
|
||||
fun pause() {
|
||||
val shouldRemove: Boolean
|
||||
synchronized(paused) {
|
||||
if (!paused.getAndSet(true) && callbackPosted.getAndSet(false)) {
|
||||
reactChoreographer.removeFrameCallback(
|
||||
ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE,
|
||||
choreographerCallback,
|
||||
)
|
||||
}
|
||||
shouldRemove = !paused.getAndSet(true) && callbackPosted.getAndSet(false)
|
||||
}
|
||||
if (shouldRemove) {
|
||||
reactChoreographer.removeFrameCallback(
|
||||
ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE,
|
||||
choreographerCallback,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
private fun scheduleCallback() {
|
||||
synchronized(paused) {
|
||||
if (!paused.get() && !callbackPosted.getAndSet(true)) {
|
||||
reactChoreographer.postFrameCallback(
|
||||
ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE,
|
||||
choreographerCallback,
|
||||
)
|
||||
}
|
||||
val shouldPost: Boolean
|
||||
synchronized(paused) { shouldPost = !paused.get() && !callbackPosted.getAndSet(true) }
|
||||
if (shouldPost) {
|
||||
reactChoreographer.postFrameCallback(
|
||||
ReactChoreographer.CallbackType.NATIVE_ANIMATED_MODULE,
|
||||
choreographerCallback,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user