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

Minor: rename Storage->Sink

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-01-13 09:32:56 +03:00
parent f027860ac0
commit 39b37b85e3
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsStorage.kt → compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilationResultsSink.kt
+2 -2
View File
@@ -20,9 +20,9 @@ import java.io.Serializable
import java.rmi.Remote
import java.rmi.RemoteException
interface CompilationResultsStorage : Remote {
interface CompilationResultsSink : Remote {
@Throws(RemoteException::class)
fun store(compilationResultCategory: Int, value: Serializable)
fun push(compilationResultCategory: Int, value: Serializable)
}
enum class CompilationResultCategory(val code: Int) {
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompileService.kt
+1 -1
View File
@@ -135,7 +135,7 @@ interface CompileService : Remote {
compilerArguments: CommonCompilerArguments,
compilationOptions: CompilationOptions,
servicesFacade: CompilerServicesFacadeBase,
compilationResultsStorage: CompilationResultsStorage?
compilationResultsSink: CompilationResultsSink?
): CallResult<Int>
@Throws(RemoteException::class)
compiler/daemon/src/org/jetbrains/kotlin/daemon/CompileServiceImpl.kt
+4 -4
View File
@@ -324,7 +324,7 @@ class CompileServiceImpl(
compilerArguments: CommonCompilerArguments,
compilationOptions: CompilationOptions,
servicesFacade: CompilerServicesFacadeBase,
compilationResultsStorage: CompilationResultsStorage?
compilationResultsSink: CompilationResultsSink?
): CompileService.CallResult<Int> {
val messageCollector = CompileServicesFacadeMessageCollector(servicesFacade, compilationOptions)
val daemonReporter = DaemonMessageReporter(servicesFacade, compilationOptions)
@@ -356,7 +356,7 @@ class CompileServiceImpl(
withIC {
doCompile(sessionId, daemonReporter, tracer = null) { eventManger, profiler ->
execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, compilationResultsStorage!!,
execIncrementalCompiler(k2jvmArgs, gradleIncrementalArgs, gradleIncrementalServicesFacade, compilationResultsSink!!,
messageCollector, daemonReporter)
}
}
@@ -388,11 +388,11 @@ class CompileServiceImpl(
k2jvmArgs: K2JVMCompilerArguments,
incrementalCompilationOptions: IncrementalCompilationOptions,
servicesFacade: IncrementalCompilerServicesFacade,
compilationResultsStorage: CompilationResultsStorage,
compilationResultsSink: CompilationResultsSink,
compilerMessageCollector: MessageCollector,
daemonMessageReporter: DaemonMessageReporter
): ExitCode {
val reporter = RemoteICReporter(servicesFacade, compilationResultsStorage, incrementalCompilationOptions)
val reporter = RemoteICReporter(servicesFacade, compilationResultsSink, incrementalCompilationOptions)
val annotationFileUpdater = if (servicesFacade.hasAnnotationsFileUpdater()) RemoteAnnotationsFileUpdater(servicesFacade) else null
val moduleFile = k2jvmArgs.module?.let(::File)
compiler/daemon/src/org/jetbrains/kotlin/daemon/report/RemoteICReporter.kt
+2 -2
View File
@@ -24,7 +24,7 @@ import java.io.Serializable
internal class RemoteICReporter(
private val servicesFacade: CompilerServicesFacadeBase,
private val compilationResultsStorage: CompilationResultsStorage,
private val compilationResultsSink: CompilationResultsSink,
compilationOptions: CompilationOptions
) : ICReporter {
private val shouldReportMessages = ReportCategory.IC_MESSAGE.code in compilationOptions.reportCategories
@@ -39,7 +39,7 @@ internal class RemoteICReporter(
override fun reportCompileIteration(sourceFiles: Collection<File>, exitCode: ExitCode) {
if (shouldReportCompileIteration) {
compilationResultsStorage.store(CompilationResultCategory.IC_COMPILE_ITERATION.code, CompileIterationResult(sourceFiles, exitCode.toString()))
compilationResultsSink.push(CompilationResultCategory.IC_COMPILE_ITERATION.code, CompileIterationResult(sourceFiles, exitCode.toString()))
}
}
}