mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Inline lazy fields in core data types (#53959)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/53959 These data-types are super common in React Native, and the anonymous inner classes add significantly to the GC workload we see. For ReadableMap this means we can save 6 additional object allocations for each LazySynchronizedImpl and the lambda that's passed in to it. On synthetic benchmarks this seems to improve core operations around ~10%. Changelog: [Internal] Reviewed By: lenaic Differential Revision: D83245864 fbshipit-source-id: 69b314a1f52a32375b5e1f591555f50bfbc31843
This commit is contained in:
1 parent
4f2755bda5
commit
29b74061e4
2 files changed
+122
-57
No files matched your search
+37
-9
@@ -20,21 +20,49 @@ import kotlin.jvm.JvmStatic
|
||||
@DoNotStrip
|
||||
public open class ReadableNativeArray protected constructor() : NativeArray(), ReadableArray {
|
||||
|
||||
private val localArray: Array<Any?> by
|
||||
lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
|
||||
jniPassCounter++
|
||||
importArray()
|
||||
private var localArrayStorage: Array<Any?>? = null
|
||||
private val localArray: Array<Any?>
|
||||
get() {
|
||||
var localArray = localArrayStorage
|
||||
if (localArray != null) {
|
||||
return localArray
|
||||
}
|
||||
|
||||
synchronized(this) {
|
||||
// Check again with the lock held to prevent duplicate construction
|
||||
localArray = localArrayStorage
|
||||
if (localArray == null) {
|
||||
localArray = importArray()
|
||||
localArrayStorage = localArray
|
||||
jniPassCounter++
|
||||
}
|
||||
return localArray
|
||||
}
|
||||
}
|
||||
|
||||
private external fun importArray(): Array<Any?>
|
||||
|
||||
private val localTypeArray: Array<ReadableType> by
|
||||
lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
|
||||
jniPassCounter++
|
||||
val tempArray = importTypeArray()
|
||||
Arrays.copyOf(tempArray, tempArray.size, Array<ReadableType>::class.java)
|
||||
private var localTypeArrayStorage: Array<ReadableType>? = null
|
||||
private val localTypeArray: Array<ReadableType>
|
||||
get() {
|
||||
var localTypeArray = localTypeArrayStorage
|
||||
if (localTypeArray != null) {
|
||||
return localTypeArray
|
||||
}
|
||||
|
||||
synchronized(this) {
|
||||
// Check again with the lock held to prevent duplicate construction
|
||||
localTypeArray = localTypeArrayStorage
|
||||
if (localTypeArray == null) {
|
||||
val tempArray = importTypeArray()
|
||||
localTypeArray = Arrays.copyOf(tempArray, tempArray.size, Array<ReadableType>::class.java)
|
||||
localTypeArrayStorage = localTypeArray
|
||||
jniPassCounter++
|
||||
}
|
||||
return localTypeArray
|
||||
}
|
||||
}
|
||||
|
||||
private external fun importTypeArray(): Array<Any>
|
||||
|
||||
override fun size(): Int = localArray.size
|
||||
|
||||
+85
-48
@@ -17,32 +17,76 @@ import com.facebook.proguard.annotations.DoNotStripAny
|
||||
*/
|
||||
@DoNotStripAny
|
||||
public open class ReadableNativeMap protected constructor() : NativeMap(), ReadableMap {
|
||||
private val keys: Array<String> by
|
||||
lazy(LazyThreadSafetyMode.SYNCHRONIZED) { importKeys().also { jniPassCounter++ } }
|
||||
|
||||
private val localMap: HashMap<String, Any?> by
|
||||
lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
|
||||
val length = keys.size
|
||||
val res = HashMap<String, Any?>(length)
|
||||
val values = importValues()
|
||||
jniPassCounter++
|
||||
for (i in 0 until length) {
|
||||
res[keys[i]] = values[i]
|
||||
}
|
||||
res
|
||||
private var keysStorage: Array<String>? = null
|
||||
private val keys: Array<String>
|
||||
get() {
|
||||
var keys = keysStorage
|
||||
if (keys != null) {
|
||||
return keys
|
||||
}
|
||||
|
||||
private val localTypeMap: HashMap<String, ReadableType> by
|
||||
lazy(LazyThreadSafetyMode.SYNCHRONIZED) {
|
||||
val length = keys.size
|
||||
val res = HashMap<String, ReadableType>(length)
|
||||
val types = importTypes()
|
||||
jniPassCounter++
|
||||
for (i in 0 until length) {
|
||||
res[keys[i]] = types[i] as ReadableType
|
||||
synchronized(this) {
|
||||
// Check again with the lock held to prevent duplicate construction
|
||||
keys = keysStorage
|
||||
if (keys == null) {
|
||||
keys = importKeys()
|
||||
keysStorage = keys
|
||||
jniPassCounter++
|
||||
}
|
||||
res
|
||||
return keys
|
||||
}
|
||||
}
|
||||
|
||||
private var localMapStorage: Map<String, Any?>? = null
|
||||
private val localMap: Map<String, Any?>
|
||||
get() {
|
||||
var localMap = localMapStorage
|
||||
if (localMap != null) {
|
||||
return localMap
|
||||
}
|
||||
|
||||
synchronized(this) {
|
||||
// Check again with the lock held to prevent duplicate construction
|
||||
localMap = localMapStorage
|
||||
if (localMap == null) {
|
||||
val keys = keys
|
||||
val length = keys.size
|
||||
localMap = HashMap<String, Any?>()
|
||||
val values = importValues()
|
||||
for (i in 0 until length) {
|
||||
localMap[keys[i]] = values[i]
|
||||
}
|
||||
localMapStorage = localMap
|
||||
jniPassCounter++
|
||||
}
|
||||
return localMap
|
||||
}
|
||||
}
|
||||
|
||||
private var localTypeMapStorage: Map<String, ReadableType>? = null
|
||||
private val localTypeMap: Map<String, ReadableType>
|
||||
get() {
|
||||
var localTypeMap = localTypeMapStorage
|
||||
if (localTypeMap != null) {
|
||||
return localTypeMap
|
||||
}
|
||||
|
||||
synchronized(this) {
|
||||
// Check again with the lock held to prevent duplicate construction
|
||||
localTypeMap = localTypeMapStorage
|
||||
if (localTypeMap == null) {
|
||||
val keys = keys
|
||||
localTypeMap = HashMap<String, ReadableType>()
|
||||
val types = importTypes()
|
||||
for (i in 0 until keys.size) {
|
||||
localTypeMap[keys[i]] = types[i] as ReadableType
|
||||
}
|
||||
localTypeMapStorage = localTypeMap
|
||||
jniPassCounter++
|
||||
}
|
||||
return localTypeMap
|
||||
}
|
||||
}
|
||||
|
||||
private external fun importKeys(): Array<String>
|
||||
|
||||
@@ -76,7 +120,7 @@ public open class ReadableNativeMap protected constructor() : NativeMap(), Reada
|
||||
private inline fun <reified T> getValue(name: String, type: Class<T>): T =
|
||||
checkInstance(name, getValue(name), type)
|
||||
|
||||
private fun getNullableValue(name: String): Any? = localMap.get(name)
|
||||
private fun getNullableValue(name: String): Any? = localMap[name]
|
||||
|
||||
private inline fun <reified T> getNullableValue(name: String, type: Class<T>): T? {
|
||||
val res = getNullableValue(name)
|
||||
@@ -110,36 +154,29 @@ public open class ReadableNativeMap protected constructor() : NativeMap(), Reada
|
||||
override fun getDynamic(name: String): Dynamic = DynamicFromMap.create(this, name)
|
||||
|
||||
override val entryIterator: Iterator<Map.Entry<String, Any>>
|
||||
get() =
|
||||
synchronized(this) {
|
||||
val iteratorKeys = keys
|
||||
val iteratorValues = importValues()
|
||||
jniPassCounter++
|
||||
return object : Iterator<Map.Entry<String, Any>> {
|
||||
var currentIndex = 0
|
||||
get() {
|
||||
val iteratorKeys = keys
|
||||
val iteratorValues = importValues()
|
||||
jniPassCounter++
|
||||
return object : Iterator<Map.Entry<String, Any>> {
|
||||
var currentIndex = 0
|
||||
|
||||
override fun hasNext(): Boolean {
|
||||
return currentIndex < iteratorKeys.size
|
||||
}
|
||||
override fun hasNext(): Boolean {
|
||||
return currentIndex < iteratorKeys.size
|
||||
}
|
||||
|
||||
override fun next(): Map.Entry<String, Any> {
|
||||
val index = currentIndex++
|
||||
return object : MutableMap.MutableEntry<String, Any> {
|
||||
override val key: String
|
||||
get() = iteratorKeys[index]
|
||||
override fun next(): Map.Entry<String, Any> {
|
||||
val index = currentIndex++
|
||||
return object : Map.Entry<String, Any> {
|
||||
override val key: String
|
||||
get() = iteratorKeys[index]
|
||||
|
||||
override val value: Any
|
||||
get() = iteratorValues[index]
|
||||
|
||||
override fun setValue(newValue: Any): Any {
|
||||
throw UnsupportedOperationException(
|
||||
"Can't set a value while iterating over a ReadableNativeMap"
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
override val value: Any
|
||||
get() = iteratorValues[index]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun keySetIterator(): ReadableMapKeySetIterator {
|
||||
val iteratorKeys = keys
|
||||
|
||||
Reference in new issue
Block a user