Add remote input stream support, plus minor tweaks

2016-09-16 17:07:45 +02:00
parent eaa332019a
commit 042fc4fadc
7 changed files with 131 additions and 9 deletions
@@ -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()
+}
@@ -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
+}
@@ -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
+}
@@ -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() }
+}