azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Native][tests] Use ThreadSafeCache instead of ConcurrentHashMap

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-11-12 17:08:34 +03:00
parent c219e53634
commit fb0dda5a24
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestCompiler.kt
+1 -2
View File
@@ -17,11 +17,10 @@ import org.jetbrains.kotlin.konan.blackboxtest.TestModule.Companion.allFriends
import org.jetbrains.kotlin.konan.blackboxtest.util.*
import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
import java.io.*
import java.util.concurrent.ConcurrentHashMap
import kotlin.system.measureTimeMillis
internal class TestCompilationFactory(private val environment: TestEnvironment) {
private val cachedCompilations: MutableMap<TestCompilationCacheKey, TestCompilation> = ConcurrentHashMap()
private val cachedCompilations = ThreadSafeCache<TestCompilationCacheKey, TestCompilation>()
private sealed interface TestCompilationCacheKey {
data class Klib(val sourceModules: Set<TestModule>, val freeCompilerArgs: TestCompilerArgs) : TestCompilationCacheKey
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/TestRunProvider.kt
+2 -2
View File
@@ -8,19 +8,19 @@ package org.jetbrains.kotlin.konan.blackboxtest
import com.intellij.openapi.util.Disposer
import org.jetbrains.kotlin.konan.blackboxtest.TestCompilationResult.Companion.assertSuccess
import org.jetbrains.kotlin.konan.blackboxtest.group.TestCaseGroupProvider
import org.jetbrains.kotlin.konan.blackboxtest.util.ThreadSafeCache
import org.jetbrains.kotlin.test.services.JUnit5Assertions.assertTrue
import org.jetbrains.kotlin.test.services.JUnit5Assertions.fail
import org.junit.jupiter.api.Assumptions.assumeTrue
import org.junit.jupiter.api.extension.ExtensionContext
import java.io.File
import java.util.concurrent.ConcurrentHashMap
internal class TestRunProvider(
private val environment: TestEnvironment,
private val testCaseGroupProvider: TestCaseGroupProvider
) : ExtensionContext.Store.CloseableResource {
private val compilationFactory = TestCompilationFactory(environment)
private val cachedCompilations: MutableMap<TestCompilationCacheKey, TestCompilation> = ConcurrentHashMap()
private val cachedCompilations = ThreadSafeCache<TestCompilationCacheKey, TestCompilation>()
fun getSingleTestRunForTestDataFile(testDataFile: File): TestRun {
environment.assertNotDisposed()
native/native.tests/tests/org/jetbrains/kotlin/konan/blackboxtest/util/ThreadSafe.kt
+1 -1
View File
@@ -26,7 +26,7 @@ internal class ThreadSafeFactory<K : Any, V>(private val function: (K) -> V) {
internal class ThreadSafeCache<K : Any, V> {
private val map = ConcurrentHashMap<K, Any>()
operator fun get(key: K): V = unwrap(map[key]) as V
operator fun get(key: K): V? = unwrap(map[key]) as V?
fun computeIfAbsent(key: K, function: (K) -> V): V = unwrap(map.computeIfAbsent(key) { wrap(function(key)) }) as V
}