diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/CompilerCallbackServicesFacadeServer.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/CompilerCallbackServicesFacadeServer.kt new file mode 100644 index 00000000000..fe56e6dfbb3 --- /dev/null +++ b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/CompilerCallbackServicesFacadeServer.kt @@ -0,0 +1,106 @@ +/* + * Copyright 2010-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.rmi.kotlinr + +import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.ScopeKind +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents +import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto +import org.jetbrains.kotlin.modules.TargetId +import org.jetbrains.kotlin.progress.CompilationCanceledStatus +import org.jetbrains.kotlin.rmi.* +import java.rmi.server.UnicastRemoteObject + +public class RemoteIncrementalCompilationComponentsServer(val base: IncrementalCompilationComponents, val port: Int = SOCKET_ANY_FREE_PORT) : RemoteIncrementalCompilationComponents { + + init { + UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) + } + + private val cacheServers = hashMapOf() + private val lookupTrackerServer by lazy { RemoteLookupTrackerServer(base.getLookupTracker()) } + + override fun getIncrementalCache(target: TargetId): RemoteIncrementalCache = + cacheServers.get(target) ?: { + val newServer = RemoteIncrementalCacheServer(base.getIncrementalCache(target), port) + cacheServers.put(target, newServer) + newServer + }() + + override fun getLookupTracker(): RemoteLookupTracker = lookupTrackerServer +} + + +public class RemoteIncrementalCacheServer(val cache: IncrementalCache, port: Int = SOCKET_ANY_FREE_PORT) : RemoteIncrementalCache { + + init { + UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) + } + + override fun getObsoletePackageParts(): Collection = cache.getObsoletePackageParts() + + override fun getObsoleteMultifileClassFacades(): Collection = cache.getObsoleteMultifileClasses() + + override fun getMultifileFacadeParts(internalName: String): Collection? = cache.getStableMultifileFacadeParts(internalName) + + override fun getMultifileFacade(partInternalName: String): String? = cache.getMultifileFacade(partInternalName) + + override fun getPackagePartData(fqName: String): JvmPackagePartProto? = cache.getPackagePartData(fqName) + + override fun getModuleMappingData(): ByteArray? = cache.getModuleMappingData() + + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { + cache.registerInline(fromPath, jvmSignature, toPath) + } + + override fun getClassFilePath(internalClassName: String): String = cache.getClassFilePath(internalClassName) + + override fun close() { + cache.close() + } + + public fun disconnect() { + UnicastRemoteObject.unexportObject(this, true) + } +} + +public class RemoteLookupTrackerServer(val base: LookupTracker, port: Int = SOCKET_ANY_FREE_PORT) : RemoteLookupTracker { + + init { + UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) + } + + override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { + base.record(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeKind, name) + } + + private val _isDoNothing: Boolean = base == LookupTracker.DO_NOTHING + override fun isDoNothing(): Boolean = _isDoNothing +} + + +public class RemoteCompilationCanceledStatusServer(val base: CompilationCanceledStatus, port: Int = SOCKET_ANY_FREE_PORT) : RemoteCompilationCanceledStatus { + + init { + UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) + } + + override fun checkCanceled() { + base.checkCanceled() + } +} \ No newline at end of file diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt index a205fb0ec40..967b7573566 100644 --- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt +++ b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/KotlinCompilerClient.kt @@ -139,8 +139,8 @@ public object KotlinCompilerClient { } - fun makeRemoteServices(services: CompilationServices): CompileService.RemoteCompilationServices = - CompileService.RemoteCompilationServices( + fun makeRemoteServices(services: CompilationServices): RemoteCompilationServices = + RemoteCompilationServices( incrementalCompilationComponents = if (services.incrementalCompilationComponents == null) null else RemoteIncrementalCompilationComponentsServer(services.incrementalCompilationComponents), compilationCanceledStatus = if (services.compilationCanceledStatus == null) null else RemoteCompilationCanceledStatusServer(services.compilationCanceledStatus) ) diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteCompilationCanceledStatusServer.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteCompilationCanceledStatusServer.kt deleted file mode 100644 index 1557d6dee22..00000000000 --- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteCompilationCanceledStatusServer.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.rmi.kotlinr - -import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.rmi.CompileService -import org.jetbrains.kotlin.rmi.LoopbackNetworkInterface -import org.jetbrains.kotlin.rmi.SOCKET_ANY_FREE_PORT -import java.rmi.server.UnicastRemoteObject - - -public class RemoteCompilationCanceledStatusServer(val base: CompilationCanceledStatus, port: Int = SOCKET_ANY_FREE_PORT) : CompileService.RemoteCompilationCanceledStatus { - - init { - UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) - } - - override fun checkCanceled() { - base.checkCanceled() - } -} \ No newline at end of file diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt deleted file mode 100644 index 9401733e765..00000000000 --- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.rmi.kotlinr - -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto -import org.jetbrains.kotlin.rmi.CompileService -import org.jetbrains.kotlin.rmi.LoopbackNetworkInterface -import org.jetbrains.kotlin.rmi.SOCKET_ANY_FREE_PORT -import java.rmi.server.UnicastRemoteObject - -public class RemoteIncrementalCacheServer(val cache: IncrementalCache, port: Int = SOCKET_ANY_FREE_PORT) : CompileService.RemoteIncrementalCache { - - init { - UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) - } - - override fun getObsoletePackageParts(): Collection = cache.getObsoletePackageParts() - - override fun getObsoleteMultifileClassFacades(): Collection = cache.getObsoleteMultifileClasses() - - override fun getMultifileFacadeParts(internalName: String): Collection? = cache.getStableMultifileFacadeParts(internalName) - - override fun getMultifileFacade(partInternalName: String): String? = cache.getMultifileFacade(partInternalName) - - override fun getPackagePartData(fqName: String): JvmPackagePartProto? = cache.getPackagePartData(fqName) - - override fun getModuleMappingData(): ByteArray? = cache.getModuleMappingData() - - override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - cache.registerInline(fromPath, jvmSignature, toPath) - } - - override fun getClassFilePath(internalClassName: String): String = cache.getClassFilePath(internalClassName) - - override fun close() { - cache.close() - } - - public fun disconnect() { - UnicastRemoteObject.unexportObject(this, true) - } -} diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCompilationComponentsServer.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCompilationComponentsServer.kt deleted file mode 100644 index 52eddc4c2a8..00000000000 --- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCompilationComponentsServer.kt +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.rmi.kotlinr - -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -import org.jetbrains.kotlin.modules.TargetId -import org.jetbrains.kotlin.rmi.CompileService -import org.jetbrains.kotlin.rmi.LoopbackNetworkInterface -import org.jetbrains.kotlin.rmi.SOCKET_ANY_FREE_PORT -import java.rmi.server.UnicastRemoteObject - - -public class RemoteIncrementalCompilationComponentsServer(val base: IncrementalCompilationComponents, val port: Int = SOCKET_ANY_FREE_PORT) : CompileService.RemoteIncrementalCompilationComponents { - - init { - UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) - } - - private val cacheServers = hashMapOf() - private val lookupTrackerServer by lazy { RemoteLookupTrackerServer(base.getLookupTracker()) } - - override fun getIncrementalCache(target: TargetId): CompileService.RemoteIncrementalCache = - cacheServers.get(target) ?: { - val newServer = RemoteIncrementalCacheServer(base.getIncrementalCache(target), port) - cacheServers.put(target, newServer) - newServer - }() - - override fun getLookupTracker(): CompileService.RemoteLookupTracker = lookupTrackerServer -} diff --git a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteLookupTrackerServer.kt b/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteLookupTrackerServer.kt deleted file mode 100644 index 197d8e817e6..00000000000 --- a/compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteLookupTrackerServer.kt +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.rmi.kotlinr - -import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.rmi.CompileService -import org.jetbrains.kotlin.rmi.LoopbackNetworkInterface -import org.jetbrains.kotlin.rmi.SOCKET_ANY_FREE_PORT -import java.rmi.server.UnicastRemoteObject - - -public class RemoteLookupTrackerServer(val base: LookupTracker, port: Int = SOCKET_ANY_FREE_PORT) : CompileService.RemoteLookupTracker { - - init { - UnicastRemoteObject.exportObject(this, port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory) - } - - override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { - base.record(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeKind, name) - } - - private val _isDoNothing: Boolean = base == LookupTracker.DO_NOTHING - override fun isDoNothing(): Boolean = _isDoNothing -} - diff --git a/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt index d4d27db8b8e..194c322a4a8 100644 --- a/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt +++ b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt @@ -16,10 +16,6 @@ package org.jetbrains.kotlin.rmi -import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto -import org.jetbrains.kotlin.modules.TargetId -import java.io.Serializable import java.rmi.Remote import java.rmi.RemoteException @@ -30,67 +26,6 @@ public interface CompileService : Remote { XML } - public interface RemoteIncrementalCache : Remote { - @Throws(RemoteException::class) - public fun getObsoletePackageParts(): Collection - - @Throws(RemoteException::class) - public fun getObsoleteMultifileClassFacades(): Collection - - @Throws(RemoteException::class) - public fun getMultifileFacade(partInternalName: String): String? - - @Throws(RemoteException::class) - public fun getPackagePartData(fqName: String): JvmPackagePartProto? - - @Throws(RemoteException::class) - public fun getModuleMappingData(): ByteArray? - - @Throws(RemoteException::class) - public fun registerInline(fromPath: String, jvmSignature: String, toPath: String) - - @Throws(RemoteException::class) - fun getClassFilePath(internalClassName: String): String - - @Throws(RemoteException::class) - public fun close() - - @Throws(RemoteException::class) - public fun getMultifileFacadeParts(internalName: String): Collection? - } - - public interface RemoteLookupTracker : Remote { - @Throws(RemoteException::class) - fun record( - lookupContainingFile: String, - lookupLine: Int?, - lookupColumn: Int?, - scopeFqName: String, - scopeKind: ScopeKind, - name: String - ) - @Throws(RemoteException::class) - fun isDoNothing(): Boolean - } - - public interface RemoteIncrementalCompilationComponents : Remote { - @Throws(RemoteException::class) - public fun getIncrementalCache(target: TargetId): RemoteIncrementalCache - - @Throws(RemoteException::class) - public fun getLookupTracker(): RemoteLookupTracker - } - - public interface RemoteCompilationCanceledStatus : Remote { - @Throws(RemoteException::class) - fun checkCanceled(): Unit - } - - public data class RemoteCompilationServices( - public val incrementalCompilationComponents: RemoteIncrementalCompilationComponents? = null, - public val compilationCanceledStatus: RemoteCompilationCanceledStatus? = null - ) : Serializable - @Throws(RemoteException::class) public fun getCompilerId(): CompilerId diff --git a/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompilerCallbackServicesFacade.kt b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompilerCallbackServicesFacade.kt new file mode 100644 index 00000000000..30667fe2060 --- /dev/null +++ b/compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompilerCallbackServicesFacade.kt @@ -0,0 +1,86 @@ +/* + * Copyright 2010-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.kotlin.rmi + +import org.jetbrains.kotlin.incremental.components.ScopeKind +import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto +import org.jetbrains.kotlin.modules.TargetId +import java.io.Serializable +import java.rmi.Remote +import java.rmi.RemoteException + +public interface RemoteIncrementalCache : Remote { + @Throws(RemoteException::class) + public fun getObsoletePackageParts(): Collection + + @Throws(RemoteException::class) + public fun getObsoleteMultifileClassFacades(): Collection + + @Throws(RemoteException::class) + public fun getMultifileFacade(partInternalName: String): String? + + @Throws(RemoteException::class) + public fun getPackagePartData(fqName: String): JvmPackagePartProto? + + @Throws(RemoteException::class) + public fun getModuleMappingData(): ByteArray? + + @Throws(RemoteException::class) + public fun registerInline(fromPath: String, jvmSignature: String, toPath: String) + + @Throws(RemoteException::class) + fun getClassFilePath(internalClassName: String): String + + @Throws(RemoteException::class) + public fun close() + + @Throws(RemoteException::class) + public fun getMultifileFacadeParts(internalName: String): Collection? +} + +public interface RemoteLookupTracker : Remote { + @Throws(RemoteException::class) + fun record( + lookupContainingFile: String, + lookupLine: Int?, + lookupColumn: Int?, + scopeFqName: String, + scopeKind: ScopeKind, + name: String + ) + @Throws(RemoteException::class) + fun isDoNothing(): Boolean +} + +public interface RemoteIncrementalCompilationComponents : Remote { + @Throws(RemoteException::class) + public fun getIncrementalCache(target: TargetId): RemoteIncrementalCache + + @Throws(RemoteException::class) + public fun getLookupTracker(): RemoteLookupTracker +} + +public interface RemoteCompilationCanceledStatus : Remote { + @Throws(RemoteException::class) + fun checkCanceled(): Unit +} + +public data class RemoteCompilationServices( + public val incrementalCompilationComponents: RemoteIncrementalCompilationComponents? = null, + public val compilationCanceledStatus: RemoteCompilationCanceledStatus? = null +) : Serializable + diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt index 02d9abd49ad..40b8148d4af 100644 --- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt +++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt @@ -59,7 +59,7 @@ class CompileServiceImpl>( } override fun remoteCompile(args: Array, - services: CompileService.RemoteCompilationServices, + services: RemoteCompilationServices, compilerOutputStream: RemoteOutputStream, outputFormat: CompileService.OutputFormat, serviceOutputStream: RemoteOutputStream @@ -72,7 +72,7 @@ class CompileServiceImpl>( } override fun remoteIncrementalCompile(args: Array, - services: CompileService.RemoteCompilationServices, + services: RemoteCompilationServices, compilerOutputStream: RemoteOutputStream, compilerOutputFormat: CompileService.OutputFormat, serviceOutputStream: RemoteOutputStream @@ -134,7 +134,7 @@ class CompileServiceImpl>( } } - private fun createCompileServices(services: CompileService.RemoteCompilationServices, rpcProfiler: Profiler): Services { + private fun createCompileServices(services: RemoteCompilationServices, rpcProfiler: Profiler): Services { val builder = Services.Builder() services.incrementalCompilationComponents?.let { builder.register(IncrementalCompilationComponents::class.java, RemoteIncrementalCompilationComponentsClient(it, rpcProfiler)) } services.compilationCanceledStatus?.let { builder.register(CompilationCanceledStatus::class.java, RemoteCompilationCanceledStatusClient(it, rpcProfiler)) } diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteCompilationCanceledStatusClient.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteCompilationCanceledStatusClient.kt index 7351336bdac..679266e11bf 100644 --- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteCompilationCanceledStatusClient.kt +++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteCompilationCanceledStatusClient.kt @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.rmi.service import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.rmi.CompileService import org.jetbrains.kotlin.rmi.DummyProfiler import org.jetbrains.kotlin.rmi.Profiler +import org.jetbrains.kotlin.rmi.RemoteCompilationCanceledStatus -class RemoteCompilationCanceledStatusClient(val proxy: CompileService.RemoteCompilationCanceledStatus, val profiler: Profiler = DummyProfiler()): CompilationCanceledStatus { +class RemoteCompilationCanceledStatusClient(val proxy: RemoteCompilationCanceledStatus, val profiler: Profiler = DummyProfiler()): CompilationCanceledStatus { override fun checkCanceled() { profiler.withMeasure(this) { proxy.checkCanceled() } } diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt index 4fd82a33867..f3b68895c16 100644 --- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt +++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.rmi.service import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto -import org.jetbrains.kotlin.rmi.CompileService import org.jetbrains.kotlin.rmi.DummyProfiler import org.jetbrains.kotlin.rmi.Profiler +import org.jetbrains.kotlin.rmi.RemoteIncrementalCache -public class RemoteIncrementalCacheClient(val cache: CompileService.RemoteIncrementalCache, val profiler: Profiler = DummyProfiler()): IncrementalCache { +public class RemoteIncrementalCacheClient(val cache: RemoteIncrementalCache, val profiler: Profiler = DummyProfiler()): IncrementalCache { override fun getObsoletePackageParts(): Collection = profiler.withMeasure(this) { cache.getObsoletePackageParts() } diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCompilationComponentsClient.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCompilationComponentsClient.kt index adf1dddb600..8181421966a 100644 --- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCompilationComponentsClient.kt +++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCompilationComponentsClient.kt @@ -20,12 +20,12 @@ import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId -import org.jetbrains.kotlin.rmi.CompileService import org.jetbrains.kotlin.rmi.DummyProfiler import org.jetbrains.kotlin.rmi.Profiler +import org.jetbrains.kotlin.rmi.RemoteIncrementalCompilationComponents -class RemoteIncrementalCompilationComponentsClient(val proxy: CompileService.RemoteIncrementalCompilationComponents, val profiler: Profiler = DummyProfiler()) : IncrementalCompilationComponents { +class RemoteIncrementalCompilationComponentsClient(val proxy: RemoteIncrementalCompilationComponents, val profiler: Profiler = DummyProfiler()) : IncrementalCompilationComponents { override fun getIncrementalCache(target: TargetId): IncrementalCache = RemoteIncrementalCacheClient(profiler.withMeasure(this) { proxy.getIncrementalCache(target) }, profiler) diff --git a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteLookupTrackerClient.kt b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteLookupTrackerClient.kt index 4dd80dbd3aa..40092c01a3f 100644 --- a/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteLookupTrackerClient.kt +++ b/compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteLookupTrackerClient.kt @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.rmi.service import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.rmi.CompileService import org.jetbrains.kotlin.rmi.DummyProfiler import org.jetbrains.kotlin.rmi.Profiler +import org.jetbrains.kotlin.rmi.RemoteLookupTracker -class RemoteLookupTrackerClient(val proxy: CompileService.RemoteLookupTracker, val profiler: Profiler = DummyProfiler()) : LookupTracker { +class RemoteLookupTrackerClient(val proxy: RemoteLookupTracker, val profiler: Profiler = DummyProfiler()) : LookupTracker { private val isDoNothing = profiler.withMeasure(this) { proxy.isDoNothing() }