diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt index 6b61c074243..b0f2e8ffdf0 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/cli/nativeTasks.kt @@ -62,7 +62,7 @@ internal class NativeKlibCommonize(options: Collection>) : Task(option val konanTargets = outputCommonizerTarget.konanTargets val commonizerTargets = konanTargets.map(::CommonizerTarget) - val progressLogger = ProgressLogger(CliLoggerAdapter(2)) + val progressLogger = ProgressLogger(CliLoggerAdapter(2), startImmediately = true) val libraryLoader = DefaultNativeLibraryLoader(progressLogger) val statsCollector = StatsCollector(statsType, commonizerTargets) val repository = FilesRepository(targetLibraries.toSet(), libraryLoader) @@ -104,7 +104,7 @@ internal class NativeDistributionCommonize(options: Collection>) : Tas val copyEndorsedLibs = getOptional { it == "copy-endorsed-libs" } ?: false val statsType = getOptional { it == "log-stats" } ?: StatsType.NONE - val progressLogger = ProgressLogger(CliLoggerAdapter(2)) + val progressLogger = ProgressLogger(CliLoggerAdapter(2), startImmediately = true) val libraryLoader = DefaultNativeLibraryLoader(progressLogger) val repository = KonanDistributionRepository(distribution, commonizerTargets.toSet(), libraryLoader) val existingTargets = commonizerTargets.filter { repository.getLibraries(it).isNotEmpty() }.toSet() diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt index 236fc1c1736..96624554b06 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/konan/LibraryCommonizer.kt @@ -27,7 +27,6 @@ internal class LibraryCommonizer internal constructor( fun run() { checkPreconditions() - progressLogger.reset() val allLibraries = loadLibraries() commonizeAndSaveResults(allLibraries) progressLogger.logTotal() @@ -45,7 +44,7 @@ internal class LibraryCommonizer internal constructor( progressLogger.warning("No platform libraries found for target ${target.prettyName}. This target will be excluded from commonization.") } } - progressLogger.log("Read lazy (uninitialized) libraries") + progressLogger.log("Resolved libraries to be commonized") return AllNativeLibraries(stdlib, librariesByTargets) } diff --git a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ProgressLogger.kt b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ProgressLogger.kt index 191473e38f5..a9b74408755 100644 --- a/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ProgressLogger.kt +++ b/native/commonizer/src/org/jetbrains/kotlin/descriptors/commonizer/utils/ProgressLogger.kt @@ -7,10 +7,18 @@ package org.jetbrains.kotlin.descriptors.commonizer.utils import org.jetbrains.kotlin.util.Logger -class ProgressLogger(private val wrapped: Logger) : Logger by wrapped { +class ProgressLogger( + private val wrapped: Logger, + startImmediately: Boolean = false +) : Logger by wrapped { private val clockMark = ResettableClockMark() private var finished = true + init { + if (startImmediately) + reset() + } + fun reset() { clockMark.reset() finished = false