kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-03-06 17:34:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ensure proper Synchronization on ReactChoreographer

Browse Source 
Summary: This diff refactors the way we synchronize in ReactChoreographer using a lock object

Reviewed By: ejanzer

Differential Revision: D14913056

fbshipit-source-id: e86c4395d5d3c3fd5b7330b72c14920b536f74ce
This commit is contained in:
David Vacca
2019-04-29 18:08:39 -07:00
committed by Facebook Github Bot
parent 3c7d8e0cc1
commit 81d0f9a690
1 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ReactAndroid/src/main/java/com/facebook/react/modules/core/ReactChoreographer.java
View File

@@ -79,6 +79,7 @@ public class ReactChoreographer {
private @Nullable volatile ChoreographerCompat mChoreographer;
private final ReactChoreographerDispatcher mReactChoreographerDispatcher;
private final ArrayDeque<ChoreographerCompat.FrameCallback>[] mCallbackQueues;
private final Object mCallbackQueuesLock = new Object();
private int mTotalCallbacks = 0;
private boolean mHasPostedCallback = false;
@@ -92,22 +93,25 @@ public class ReactChoreographer {
initializeChoreographer(null);
}
public synchronized void postFrameCallback(
public void postFrameCallback(
CallbackType type,
ChoreographerCompat.FrameCallback frameCallback) {
mCallbackQueues[type.getOrder()].addLast(frameCallback);
mTotalCallbacks++;
Assertions.assertCondition(mTotalCallbacks > 0);
if (!mHasPostedCallback) {
if (mChoreographer == null) {
initializeChoreographer(new Runnable(){
@Override
public void run() {
postFrameCallbackOnChoreographer();
}
});
} else {
postFrameCallbackOnChoreographer();
synchronized (mCallbackQueuesLock) {
mCallbackQueues[type.getOrder()].addLast(frameCallback);
mTotalCallbacks++;
Assertions.assertCondition(mTotalCallbacks > 0);
if (!mHasPostedCallback) {
if (mChoreographer == null) {
initializeChoreographer(
new Runnable() {
@Override
public void run() {
postFrameCallbackOnChoreographer();
}
});
} else {
postFrameCallbackOnChoreographer();
}
}
}
}
@@ -133,10 +137,10 @@ public class ReactChoreographer {
});
}
public synchronized void removeFrameCallback(
public void removeFrameCallback(
CallbackType type,
ChoreographerCompat.FrameCallback frameCallback) {
synchronized (ReactChoreographer.this) {
synchronized (mCallbackQueuesLock) {
if (mCallbackQueues[type.getOrder()].removeFirstOccurrence(frameCallback)) {
mTotalCallbacks--;
maybeRemoveFrameCallback();
@@ -160,7 +164,7 @@ public class ReactChoreographer {
@Override
public void doFrame(long frameTimeNanos) {
synchronized (ReactChoreographer.this) {
synchronized (mCallbackQueuesLock) {
mHasPostedCallback = false;
for (int i = 0; i < mCallbackQueues.length; i++) {
int initialLength = mCallbackQueues[i].size();