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

Protect access to SLRUCache for scripts with a lock

Browse Source
This commit is contained in:
Nikolay Krasko
2018-05-31 12:53:10 +03:00
parent 6d7510a6f4
commit cc04b72dfd
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
+10 -3
View File
@@ -186,6 +186,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
val specialModuleInfo = files.map(KtFile::getModuleInfo).toSet().single() val specialModuleInfo = files.map(KtFile::getModuleInfo).toSet().single()
val sdk = specialModuleInfo.sdk val sdk = specialModuleInfo.sdk
val settings = PlatformAnalysisSettings(targetPlatform, sdk, specialModuleInfo.supportsAdditionalBuiltInsMembers()) val settings = PlatformAnalysisSettings(targetPlatform, sdk, specialModuleInfo.supportsAdditionalBuiltInsMembers())
// File copies are created during completion and receive correct modification events through POM. // File copies are created during completion and receive correct modification events through POM.
// Dummy files created e.g. by J2K do not receive events. // Dummy files created e.g. by J2K do not receive events.
val filesModificationTracker = if (files.all { it.originalFile != it }) { val filesModificationTracker = if (files.all { it.originalFile != it }) {
@@ -343,7 +344,6 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
false false
) )
private val specialFileCachesLock = Any()
private val specialFilesCacheProvider = CachedValueProvider { private val specialFilesCacheProvider = CachedValueProvider {
// NOTE: computations inside createFacadeForFilesWithSpecialModuleInfo depend on project root structure // NOTE: computations inside createFacadeForFilesWithSpecialModuleInfo depend on project root structure
// so we additionally drop the whole slru cache on change // so we additionally drop the whole slru cache on change
@@ -357,10 +357,11 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
} }
private fun getFacadeForSpecialFiles(files: Set<KtFile>): ProjectResolutionFacade { private fun getFacadeForSpecialFiles(files: Set<KtFile>): ProjectResolutionFacade {
val cachedValue = synchronized(specialFileCachesLock) { val cachedValue: SLRUCache<Set<KtFile>, ProjectResolutionFacade> = synchronized(specialFilesCacheProvider) {
CachedValuesManager.getManager(project).getCachedValue(project, specialFilesCacheProvider) CachedValuesManager.getManager(project).getCachedValue(project, specialFilesCacheProvider)
} }
// In Upsource, we create multiple instances of KotlinCacheService, which all access the same CachedValue instance (UP-8046) // In Upsource, we create multiple instances of KotlinCacheService, which all access the same CachedValue instance (UP-8046)
// This is so because class name of provider is used as a key when fetching cached value, see CachedValueManager.getKeyForClass.
// To avoid race conditions, we can't use the local lock to access the cached value contents. // To avoid race conditions, we can't use the local lock to access the cached value contents.
synchronized(cachedValue) { synchronized(cachedValue) {
return cachedValue.get(files) return cachedValue.get(files)
@@ -379,7 +380,13 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
} }
private fun getFacadeForScripts(files: Set<KtFile>): ProjectResolutionFacade { private fun getFacadeForScripts(files: Set<KtFile>): ProjectResolutionFacade {
return CachedValuesManager.getManager(project).getCachedValue(project, scriptsCacheProvider).get(files) val cachedValue: SLRUCache<Set<KtFile>, ProjectResolutionFacade> = synchronized(scriptsCacheProvider) {
CachedValuesManager.getManager(project).getCachedValue(project, scriptsCacheProvider)
}
synchronized(cachedValue) {
return cachedValue.get(files)
}
} }
private fun getFacadeToAnalyzeFiles(files: Collection<KtFile>): ResolutionFacade { private fun getFacadeToAnalyzeFiles(files: Collection<KtFile>): ResolutionFacade {