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

[LL API] do not store LLFirSession in RAM for unused modules

Browse Source 
^KTIJ-22749
This commit is contained in:
Ilya Kirillov
2022-09-13 14:53:41 +02:00
parent 836b6dae9f
commit bfec7e271f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/sessions/LLFirSessionProviderStorage.kt
+10 -5
View File
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.analysis.project.structure.*
import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory import org.jetbrains.kotlin.analysis.providers.KotlinModificationTrackerFactory
import org.jetbrains.kotlin.analysis.providers.KtModuleStateTracker import org.jetbrains.kotlin.analysis.providers.KtModuleStateTracker
import org.jetbrains.kotlin.analysis.utils.trackers.CompositeModificationTracker import org.jetbrains.kotlin.analysis.utils.trackers.CompositeModificationTracker
import java.lang.ref.SoftReference
class LLFirSessionProviderStorage(val project: Project) { class LLFirSessionProviderStorage(val project: Project) {
private val sourceAsUseSiteSessionCache = LLFirSessionsCache() private val sourceAsUseSiteSessionCache = LLFirSessionsCache()
@@ -120,7 +121,7 @@ private class LLFirSessionsCache {
val reversedDependencies = sessions.reversedDependencies { session -> val reversedDependencies = sessions.reversedDependencies { session ->
if (session.validityTracker.isValid) { if (session.validityTracker.isValid) {
session.firSession.ktModule.directRegularDependencies.mapNotNull { mappings[it] } session.ktModule.directRegularDependencies.mapNotNull { mappings[it] }
} else emptyList() } else emptyList()
} }
@@ -141,8 +142,11 @@ private class LLFirSessionsCache {
} }
} }
return wasSessionInvalidated.entries return wasSessionInvalidated.entries
.mapNotNull { (session, wasInvalidated) -> session.takeUnless { wasInvalidated } } .mapNotNull { (sessionWithTracker, wasInvalidated) ->
.associate { session -> session.firSession.llFirModuleData.ktModule to session.firSession } if (wasInvalidated) return@mapNotNull null
val firSession = sessionWithTracker.firSessionSoftReference.get() ?: return@mapNotNull null
sessionWithTracker.ktModule to firSession
}.toMap()
} }
private fun <T> Collection<T>.reversedDependencies(getDependencies: (T) -> List<T>): Map<T, List<T>> { private fun <T> Collection<T>.reversedDependencies(getDependencies: (T) -> List<T>): Map<T, List<T>> {
@@ -158,15 +162,16 @@ private class LLFirSessionsCache {
private class FirSessionWithModificationTracker( private class FirSessionWithModificationTracker(
project: Project, project: Project,
val firSession: LLFirSession, firSession: LLFirSession,
) { ) {
val firSessionSoftReference: SoftReference<LLFirSession> = SoftReference(firSession)
val ktModule = firSession.llFirModuleData.ktModule
val validityTracker: KtModuleStateTracker val validityTracker: KtModuleStateTracker
private val modificationTracker: ModificationTracker private val modificationTracker: ModificationTracker
init { init {
val trackerFactory = KotlinModificationTrackerFactory.getService(project) val trackerFactory = KotlinModificationTrackerFactory.getService(project)
val ktModule = firSession.llFirModuleData.ktModule
validityTracker = trackerFactory.createModuleStateTracker(ktModule) validityTracker = trackerFactory.createModuleStateTracker(ktModule)