Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fabric PerfLogger: prevent ConcurrentModificationException

Browse Source 
Summary: Some surfaces throw ConcurrentModificationException when logging detailed perf for Fabric. I've refactored the ReactMarker class to use a threadsafe ArrayList and removed synchronization, which is safer and should improve perf everywhere the markers are used, even if there are zero listeners.

Reviewed By: mdvacca

Differential Revision: D16656139

fbshipit-source-id: 34572f9ad19028a273e0837b0b895c5e8a47976a
This commit is contained in:
Joshua Gross
2019-08-05 15:33:34 -07:00
committed by Facebook Github Bot
parent c21e36db45
commit 751d0e75b0
1 changed files with 17 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarker.java
+17 -32
View File
@@ -7,8 +7,8 @@ package com.facebook.react.bridge;
import androidx.annotation.Nullable;
import com.facebook.proguard.annotations.DoNotStrip;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* Static class that allows markers to be placed in React code and responded to in a configurable
@@ -31,70 +31,57 @@ public class ReactMarker {
// Use a list instead of a set here because we expect the number of listeners
// to be very small, and we want listeners to be called in a deterministic
// order.
private static final List<MarkerListener> sListeners = new ArrayList<>();
private static final List<MarkerListener> sListeners = new CopyOnWriteArrayList<>();
// Use a list instead of a set here because we expect the number of listeners
// to be very small, and we want listeners to be called in a deterministic
// order. For Fabric-specific events.
private static final List<FabricMarkerListener> sFabricMarkerListeners = new ArrayList<>();
private static final List<FabricMarkerListener> sFabricMarkerListeners =
new CopyOnWriteArrayList<>();
@DoNotStrip
public static void addListener(MarkerListener listener) {
synchronized (sListeners) {
if (!sListeners.contains(listener)) {
sListeners.add(listener);
}
if (!sListeners.contains(listener)) {
sListeners.add(listener);
}
}
@DoNotStrip
public static void removeListener(MarkerListener listener) {
synchronized (sListeners) {
sListeners.remove(listener);
}
sListeners.remove(listener);
}
@DoNotStrip
public static void clearMarkerListeners() {
synchronized (sListeners) {
sListeners.clear();
}
sListeners.clear();
}
// Specific to Fabric marker listeners
@DoNotStrip
public static void addFabricListener(FabricMarkerListener listener) {
synchronized (sFabricMarkerListeners) {
if (!sFabricMarkerListeners.contains(listener)) {
sFabricMarkerListeners.add(listener);
}
if (!sFabricMarkerListeners.contains(listener)) {
sFabricMarkerListeners.add(listener);
}
}
// Specific to Fabric marker listeners
@DoNotStrip
public static void removeFabricListener(FabricMarkerListener listener) {
synchronized (sFabricMarkerListeners) {
sFabricMarkerListeners.remove(listener);
}
sFabricMarkerListeners.remove(listener);
}
// Specific to Fabric marker listeners
@DoNotStrip
public static void clearFabricMarkerListeners() {
synchronized (sFabricMarkerListeners) {
sFabricMarkerListeners.clear();
}
sFabricMarkerListeners.clear();
}
// Specific to Fabric marker listeners
@DoNotStrip
public static void logFabricMarker(
ReactMarkerConstants name, @Nullable String tag, int instanceKey, long timestamp) {
synchronized (sFabricMarkerListeners) {
for (FabricMarkerListener listener : sFabricMarkerListeners) {
listener.logFabricMarker(name, tag, instanceKey, timestamp);
}
for (FabricMarkerListener listener : sFabricMarkerListeners) {
listener.logFabricMarker(name, tag, instanceKey, timestamp);
}
}
@@ -143,11 +130,9 @@ public class ReactMarker {
@DoNotStrip
public static void logMarker(ReactMarkerConstants name, @Nullable String tag, int instanceKey) {
synchronized (sListeners) {
for (MarkerListener listener : sListeners) {
listener.logMarker(name, tag, instanceKey);
}
}
logFabricMarker(name, tag, instanceKey);
for (MarkerListener listener : sListeners) {
listener.logMarker(name, tag, instanceKey);
}
}
}