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

report perf only if enabled in command line

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-01-28 15:59:02 +01:00
parent 7fd1f507e4
commit 6f7aed2601
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java
+2
View File
@@ -28,6 +28,8 @@ public class CLIConfigurationKeys {
CompilerConfigurationKey.create("compiler plugins"); CompilerConfigurationKey.create("compiler plugins");
public static final CompilerConfigurationKey<Boolean> ALLOW_KOTLIN_PACKAGE = public static final CompilerConfigurationKey<Boolean> ALLOW_KOTLIN_PACKAGE =
CompilerConfigurationKey.create("allow kotlin package"); CompilerConfigurationKey.create("allow kotlin package");
public static final CompilerConfigurationKey<Boolean> REPORT_PERF =
CompilerConfigurationKey.create("report performance information");
private CLIConfigurationKeys() { private CLIConfigurationKeys() {
} }
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+4 -3
View File
@@ -126,7 +126,6 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
if (arguments.script) { if (arguments.script) {
configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition) configuration.add(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, StandardScriptDefinition)
shouldReportPerf = false
} }
if (arguments.skipMetadataVersionCheck) { if (arguments.skipMetadataVersionCheck) {
@@ -238,7 +237,6 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
// allows to track GC time for each run when repeated compilation is used // allows to track GC time for each run when repeated compilation is used
private val elapsedGCTime = hashMapOf<String, Long>() private val elapsedGCTime = hashMapOf<String, Long>()
private var elapsedJITTime = 0L private var elapsedJITTime = 0L
private var shouldReportPerf = true
fun resetInitStartTime() { fun resetInitStartTime() {
if (initStartNanos == 0L) { if (initStartNanos == 0L) {
@@ -251,7 +249,9 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
} }
fun reportPerf(configuration: CompilerConfiguration, message: String) { fun reportPerf(configuration: CompilerConfiguration, message: String) {
if (!shouldReportPerf) return if (!configuration.get(CLIConfigurationKeys.REPORT_PERF, false)) {
return
}
val collector = configuration[CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY]!! val collector = configuration[CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY]!!
collector.report(CompilerMessageSeverity.INFO, "PERF: " + message, CompilerMessageLocation.NO_LOCATION) collector.report(CompilerMessageSeverity.INFO, "PERF: " + message, CompilerMessageLocation.NO_LOCATION)
@@ -281,6 +281,7 @@ open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
configuration.put(JVMConfigurationKeys.DISABLE_OPTIMIZATION, arguments.noOptimize) configuration.put(JVMConfigurationKeys.DISABLE_OPTIMIZATION, arguments.noOptimize)
configuration.put(JVMConfigurationKeys.MULTIFILE_FACADES_OPEN, arguments.multifileFacadesOpen); configuration.put(JVMConfigurationKeys.MULTIFILE_FACADES_OPEN, arguments.multifileFacadesOpen);
configuration.put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage); configuration.put(CLIConfigurationKeys.ALLOW_KOTLIN_PACKAGE, arguments.allowKotlinPackage);
configuration.put(CLIConfigurationKeys.REPORT_PERF, arguments.reportPerf);
} }
private fun getClasspath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): List<File> { private fun getClasspath(paths: KotlinPaths, arguments: K2JVMCompilerArguments): List<File> {