Add remote input stream support, plus minor tweaks

compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt

@@ -16,12 +16,14 @@
 
 package org.jetbrains.kotlin.cli.common.messages
 
+import java.io.Serializable
+
 data class CompilerMessageLocation private constructor(
         val path: String?,
         val line: Int,
         val column: Int,
         val lineContent: String?
-) {
+) : Serializable {
     override fun toString(): String =
             path + (if (line != -1 || column != -1) " ($line:$column)" else "")
 
@@ -35,5 +37,7 @@ data class CompilerMessageLocation private constructor(
                 lineContent: String?
         ): CompilerMessageLocation =
                 if (path == null) NO_LOCATION else CompilerMessageLocation(path, line, column, lineContent)
+
+        private val serialVersionUID: Long = 8228357578L // just a random number, should be changed when serialized data is changed
     }
 }

compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/GenericRepl.kt

@@ -55,8 +55,11 @@ open class GenericReplChecker(
         messageCollector: MessageCollector
 ) : ReplChecker {
     protected val environment = run {
-        compilerConfiguration.add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, DelegatingScriptDefWithNoParams(scriptDefinition))
+        compilerConfiguration.apply {
-        compilerConfiguration.put<MessageCollector>(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
+            add(JVMConfigurationKeys.SCRIPT_DEFINITIONS, DelegatingScriptDefWithNoParams(scriptDefinition))
+            put<MessageCollector>(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector)
+            put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true)
+        }
         KotlinCoreEnvironment.createForProduction(disposable, compilerConfiguration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
     }
 

compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/RemoteInputStreamServer.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2016 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.daemon.client
+
+import org.jetbrains.kotlin.daemon.common.LoopbackNetworkInterface
+import org.jetbrains.kotlin.daemon.common.RemoteInputStream
+import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT
+import java.io.InputStream
+import java.rmi.server.UnicastRemoteObject
+
+
+class RemoteInputStreamServer(val `in`: InputStream, port: Int = SOCKET_ANY_FREE_PORT)
+: RemoteInputStream,
+  UnicastRemoteObject(port, LoopbackNetworkInterface.clientLoopbackSocketFactory, LoopbackNetworkInterface.serverLoopbackSocketFactory)
+{
+    override fun close() {
+        `in`.close()
+    }
+
+    override fun read(length: Int): ByteArray {
+        val buf = ByteArray(length)
+        val readBytes = `in`.read(buf, 0, length)
+        return if (readBytes == length) buf
+               else buf.copyOfRange(0, readBytes)
+    }
+
+    override fun read(): Int =
+            `in`.read()
+}

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/ClientUtils.kt

@@ -80,3 +80,11 @@ private inline fun tryConnectToDaemon(port: Int, report: (DaemonReportCategory,
     }
     return null
 }
+
+
+fun makeAutodeletingFlagFile(keyword: String = "compiler-client"): File {
+    val validChars = "^a-zA-Z0-9-_"
+    val flagFile = File.createTempFile("kotlin-${keyword.filter { validChars.contains(it) }}-", "-is-running")
+    flagFile.deleteOnExit()
+    return flagFile
+}

compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/RemoteInputStream.kt

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2010-2016 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.daemon.common
+
+import java.rmi.Remote
+import java.rmi.RemoteException
+
+interface RemoteInputStream : Remote {
+
+    @Throws(RemoteException::class)
+    fun close()
+
+    @Throws(RemoteException::class)
+    fun read(length: Int): ByteArray
+
+    @Throws(RemoteException::class)
+    fun read(): Int
+}

compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteInputStreamClient.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010-2016 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.daemon
+
+import org.jetbrains.kotlin.daemon.common.DummyProfiler
+import org.jetbrains.kotlin.daemon.common.Profiler
+import org.jetbrains.kotlin.daemon.common.RemoteInputStream
+import java.io.InputStream
+
+class RemoteInputStreamClient(val remote: RemoteInputStream, val profiler: Profiler = DummyProfiler()): InputStream() {
+    override fun read(data: ByteArray): Int = read(data, 0, data.size)
+
+    override fun read(data: ByteArray, offset: Int, length: Int): Int =
+            profiler.withMeasure(this) {
+                val bytes = remote.read(length)
+                assert(bytes.size <= length)
+                System.arraycopy(bytes, 0, data, offset, length)
+                bytes.size
+            }
+
+    override fun read(): Int =
+            profiler.withMeasure(this) { remote.read() }
+}

jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt

@@ -157,13 +157,8 @@ object KotlinCompilerRunner {
                 val profiler = if (daemonOptions.reportPerf) WallAndThreadAndMemoryTotalProfiler(withGC = false) else DummyProfiler()
 
                 profiler.withMeasure(null) {
-                    fun newFlagFile(): File {
-                        val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running")
-                        flagFile.deleteOnExit()
-                        return flagFile
-                    }
                     val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true)
-                    connection = DaemonConnection(daemon, daemon?.leaseCompileSession(newFlagFile().absolutePath)?.get() ?: CompileService.NO_SESSION)
+                    connection = DaemonConnection(daemon, daemon?.leaseCompileSession(makeAutodeletingFlagFile("compiler-jps-session").absolutePath)?.get() ?: CompileService.NO_SESSION)
                 }
 
                 for (msg in daemonReportMessages) {