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

Remove operations tracer from compile() interface

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-01-10 19:43:28 +03:00
parent 99c72b6dff
commit bf50a23221
4 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+1 -2
View File
@@ -140,8 +140,7 @@ interface CompileService : Remote {
targetPlatform: TargetPlatform,
compilerArguments: CommonCompilerArguments,
additionalCompilerArguments: AdditionalCompilerArguments,
servicesFacade: CompilerServicesFacadeBase,
operationsTracer: RemoteOperationsTracer?
servicesFacade: CompilerServicesFacadeBase
): CallResult<Int>
@Throws(RemoteException::class)
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+7 -8
View File
@@ -327,8 +327,7 @@ class CompileServiceImpl(
targetPlatform: CompileService.TargetPlatform,
compilerArguments: CommonCompilerArguments,
additionalCompilerArguments: AdditionalCompilerArguments,
servicesFacade: CompilerServicesFacadeBase,
operationsTracer: RemoteOperationsTracer?
servicesFacade: CompilerServicesFacadeBase
): CompileService.CallResult<Int> {
val messageCollector = CompileServicesFacadeMessageCollector(servicesFacade, additionalCompilerArguments)
val serviceReporter = CompileServiceReporterImpl(servicesFacade, additionalCompilerArguments)
@@ -337,13 +336,13 @@ class CompileServiceImpl(
CompileService.CompilerMode.JPS_COMPILER -> {
val jpsServicesFacade = servicesFacade as JpsCompilerServicesFacade
doCompile(sessionId, serviceReporter, operationsTracer) { eventManger, profiler ->
doCompile(sessionId, serviceReporter, tracer = null) { eventManger, profiler ->
val services = createCompileServices(jpsServicesFacade, eventManger, profiler)
execCompiler(targetPlatform, services, compilerArguments, messageCollector)
}
}
CompileService.CompilerMode.NON_INCREMENTAL_COMPILER -> {
doCompile(sessionId, serviceReporter, operationsTracer) { eventManger, profiler ->
doCompile(sessionId, serviceReporter, tracer = null) { eventManger, profiler ->
execCompiler(targetPlatform, Services.EMPTY, compilerArguments, messageCollector)
}
}
@@ -357,7 +356,7 @@ class CompileServiceImpl(
val gradleIncrementalServicesFacade = servicesFacade as IncrementalCompilerServicesFacade
withIC {
doCompile(sessionId, serviceReporter, operationsTracer) { eventManger, profiler ->
doCompile(sessionId, serviceReporter, tracer = null) { eventManger, profiler ->
execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, messageCollector)
}
}
@@ -678,11 +677,11 @@ class CompileServiceImpl(
private fun doCompile(sessionId: Int,
compileServiceReporter: CompileServiceReporter,
operationsTracer: RemoteOperationsTracer?,
tracer: RemoteOperationsTracer?,
body: (EventManger, Profiler) -> ExitCode): CompileService.CallResult<Int> =
ifAlive {
withValidClientOrSessionProxy(sessionId) { session ->
operationsTracer?.before("compile")
tracer?.before("compile")
val rpcProfiler = if (daemonOptions.reportPerf) WallAndThreadTotalProfiler() else DummyProfiler()
val eventManger = EventMangerImpl()
try {
@@ -693,7 +692,7 @@ class CompileServiceImpl(
}
finally {
eventManger.fireCompilationFinished()
operationsTracer?.after("compile")
tracer?.after("compile")
}
}
}
jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+1 -2
View File
@@ -105,8 +105,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
targetPlatform,
compilerArgs,
AdditionalCompilerArguments(reportingFilters = getReportingFilters(compilerArgs.verbose)),
JpsCompilerServicesFacadeImpl(environment),
operationsTracer = null)
JpsCompilerServicesFacadeImpl(environment))
}
return res?.get()?.let { exitCodeFromProcessExitCode(it) }
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt
+2 -4
View File
@@ -170,8 +170,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
targetPlatform,
environment.compilerArgs,
AdditionalCompilerArguments(reportingFilters = getNonIncrementalReportingFilters(environment.compilerArgs.verbose)),
GradleCompilerServicesFacadeImpl(project, environment.messageCollector),
operationsTracer = null)
GradleCompilerServicesFacadeImpl(project, environment.messageCollector))
}
val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }
@@ -202,8 +201,7 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil
CompileService.TargetPlatform.JVM,
environment.compilerArgs,
additionalCompilerArguments,
GradleIncrementalCompilerServicesFacadeImpl(project, environment),
operationsTracer = null)
GradleIncrementalCompilerServicesFacadeImpl(project, environment))
}
val exitCode = res?.get()?.let { exitCodeFromProcessExitCode(it) }