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

Simple test with daemon compilation, minor fixes mostly for easier testing

Browse Source
This commit is contained in:
ligee
2015-08-20 15:02:41 +02:00
committed by Ilya Chernikov
parent 6e3ce69faa
commit 434c30c1bc
6 changed files with 101 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rmi/kotlinr/src/KotlinCompilerClient.kt
+19 -5
View File
@@ -157,19 +157,33 @@ public class KotlinCompilerClient {
return connectToService(compilerId, daemonOptions, errStream)
}
public fun shutdownCompileService(): Unit {
KotlinCompilerClient.connectToCompileService(CompilerId(), DaemonLaunchingOptions(), DaemonOptions(), System.out, autostart = false, checkId = false)
public fun shutdownCompileService(daemonOptions: DaemonOptions): Unit {
KotlinCompilerClient.connectToCompileService(CompilerId(), DaemonLaunchingOptions(), daemonOptions, System.out, autostart = false, checkId = false)
?.shutdown()
}
public fun incrementalCompile(compiler: CompileService, args: Array<String>, caches: Map<String, IncrementalCache>, out: OutputStream): Int {
public fun shutdownCompileService(): Unit {
shutdownCompileService(DaemonOptions())
}
public fun compile(compiler: CompileService, args: Array<out String>, out: OutputStream): Int {
val outStrm = RemoteOutputStreamServer(out)
try {
return compiler.remoteCompile(args, outStrm, CompileService.OutputFormat.PLAIN)
}
finally {
outStrm.disconnect()
}
}
public fun incrementalCompile(compiler: CompileService, args: Array<out String>, caches: Map<String, IncrementalCache>, out: OutputStream): Int {
val outStrm = RemoteOutputStreamServer(out)
val cacheServers = hashMapOf<String, RemoteIncrementalCacheServer>()
try {
caches.forEach { cacheServers.put( it.getKey(), RemoteIncrementalCacheServer( it.getValue())) }
val res = compiler.remoteIncrementalCompile(args, cacheServers, outStrm, CompileService.OutputFormat.XML)
return res
return compiler.remoteIncrementalCompile(args, cacheServers, outStrm, CompileService.OutputFormat.XML)
}
finally {
cacheServers.forEach { it.getValue().disconnect() }
compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt
+1 -1
View File
@@ -51,7 +51,7 @@ public interface CompileService : Remote {
throws(RemoteException::class)
public fun remoteIncrementalCompile(
args: Array<String>,
args: Array<out String>,
caches: Map<String, RemoteIncrementalCache>,
outputStream: RemoteOutputStream,
outputFormat: OutputFormat): Int
compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/CompileServiceImpl.kt
+2 -2
View File
@@ -126,7 +126,7 @@ class CompileServiceImpl<Compiler: CLICompiler<*>>(
val res = body()
val endTime = System.nanoTime()
val endMem = usedMemory() / 1024
log.info("Done")
log.info("Done with result " + res.toString())
log.info("Elapsed time: " + TimeUnit.NANOSECONDS.toMillis(endTime - startTime) + " ms")
log.info("Used memory: $endMem kb (${"%+d".format(endMem - startMem)} kb)")
return res
@@ -178,7 +178,7 @@ class CompileServiceImpl<Compiler: CLICompiler<*>>(
}
}
override fun remoteIncrementalCompile(args: Array<String>, caches: Map<String, CompileService.RemoteIncrementalCache>, errStream: RemoteOutputStream, outputFormat: CompileService.OutputFormat): Int =
override fun remoteIncrementalCompile(args: Array<out String>, caches: Map<String, CompileService.RemoteIncrementalCache>, errStream: RemoteOutputStream, outputFormat: CompileService.OutputFormat): Int =
ifAlive {
checkedCompile(args) {
val strm = RemoteOutputStreamClient(errStream)