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

[Commonizer] Force GC after each serialized target

Browse Source
This commit is contained in:
Dmitriy Dolovov
2021-02-02 20:10:51 +03:00
parent ff45e58543
commit 62897a194b
1 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/facade.kt
+26 -21
View File
@@ -18,9 +18,8 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager
import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.StorageManager
fun runCommonization(parameters: CommonizerParameters) { fun runCommonization(parameters: CommonizerParameters) {
val resultsConsumer = parameters.resultsConsumer
if (!parameters.hasAnythingToCommonize()) { if (!parameters.hasAnythingToCommonize()) {
resultsConsumer.successfullyFinished(Status.NOTHING_TO_DO) parameters.resultsConsumer.successfullyFinished(Status.NOTHING_TO_DO)
return return
} }
@@ -30,28 +29,12 @@ fun runCommonization(parameters: CommonizerParameters) {
val mergedTree = mergeResult.root val mergedTree = mergeResult.root
// build resulting declarations: // build resulting declarations:
val klibFragmentWriteStrategy = ChunkedKlibModuleFragmentWriteStrategy()
for (targetIndex in 0 until mergedTree.dimension) { for (targetIndex in 0 until mergedTree.dimension) {
val (target, metadataModules) = MetadataBuilder.build(mergedTree, targetIndex, parameters.statsCollector) serializeTarget(mergeResult, targetIndex, parameters)
System.gc()
val commonizedModules: List<ModuleResult.Commonized> = metadataModules.map { metadataModule ->
val libraryName = metadataModule.name
val serializedMetadata = with(metadataModule.write(klibFragmentWriteStrategy)) {
SerializedMetadata(header, fragments, fragmentNames)
}
ModuleResult.Commonized(libraryName, serializedMetadata)
}
val missingModules: List<ModuleResult.Missing> = if (target is LeafTarget)
mergeResult.missingModuleInfos.getValue(target).map { ModuleResult.Missing(it.originalLocation) }
else emptyList()
resultsConsumer.consumeResults(target, commonizedModules + missingModules)
} }
resultsConsumer.successfullyFinished(Status.DONE) parameters.resultsConsumer.successfullyFinished(Status.DONE)
} }
private fun mergeAndCommonize(storageManager: StorageManager, parameters: CommonizerParameters): CirTreeMergeResult { private fun mergeAndCommonize(storageManager: StorageManager, parameters: CommonizerParameters): CirTreeMergeResult {
@@ -75,3 +58,25 @@ private fun mergeAndCommonize(storageManager: StorageManager, parameters: Common
return mergeResult return mergeResult
} }
private fun serializeTarget(mergeResult: CirTreeMergeResult, targetIndex: Int, parameters: CommonizerParameters) {
val (target, metadataModules) = MetadataBuilder.build(mergeResult.root, targetIndex, parameters.statsCollector)
val commonizedModules: List<ModuleResult.Commonized> = metadataModules.map { metadataModule ->
val libraryName = metadataModule.name
val serializedMetadata = with(metadataModule.write(KLIB_FRAGMENT_WRITE_STRATEGY)) {
SerializedMetadata(header, fragments, fragmentNames)
}
ModuleResult.Commonized(libraryName, serializedMetadata)
}
val missingModules: List<ModuleResult.Missing> = if (target is LeafTarget)
mergeResult.missingModuleInfos.getValue(target).map { ModuleResult.Missing(it.originalLocation) }
else emptyList()
parameters.resultsConsumer.consumeResults(target, commonizedModules + missingModules)
}
private val KLIB_FRAGMENT_WRITE_STRATEGY = ChunkedKlibModuleFragmentWriteStrategy()