Handle process

Author: markaren

Diff for: fmu-wrapper/src/main/kotlin/no/ntnu/ihb/fmuproxy/FmuWrapper.kt

@@ -9,19 +9,18 @@ import no.ntnu.ihb.fmuproxy.thrift.internal.InternalFmuService
 import org.apache.thrift.protocol.TBinaryProtocol
 import org.apache.thrift.transport.TFramedTransport
 import org.apache.thrift.transport.TSocket
-import java.io.Closeable
-import java.io.File
-import java.io.FileInputStream
-import java.io.StringReader
+import java.io.*
+import java.util.concurrent.TimeUnit
 import javax.xml.bind.JAXB
 
 
 class FmuWrapper(
-    args: Map<String, Any>
+        args: Map<String, Any>
 ) : Fmi2Slave(args) {
 
     private val fmu: File
     private val client: ThriftFmuClient?
+    private var localProcess: Process? = null
 
     override val automaticallyAssignStartValues = false
 
@@ -34,7 +33,8 @@ class FmuWrapper(
             val remote = settings.remote
             if (remote == null) {
                 val server = getFmuResource("fmu-proxy-server.jar")
-                val port = startLocalProxy(server, fmu)
+                val (process, port) = startLocalProxy(server, fmu)
+                this.localProcess = process
                 Thread.sleep(1000)
                 this.client = ThriftFmuClient("localhost", port)
             } else {
@@ -45,6 +45,10 @@ class FmuWrapper(
         }
     }
 
+    override fun setupExperiment(startTime: Double, stopTime: Double, tolerance: Double) {
+        this.client?.setupExperiment(startTime, stopTime, tolerance)
+    }
+
     override fun enterInitialisationMode() {
         this.client?.enterInitializationMode()
     }
@@ -53,10 +57,6 @@ class FmuWrapper(
         this.client?.exitInitializationMode()
     }
 
-    override fun setupExperiment(startTime: Double, stopTime: Double, tolerance: Double) {
-        this.client?.setupExperiment(startTime, stopTime, tolerance)
-    }
-
     override fun doStep(currentTime: Double, dt: Double) {
         this.client?.doStep(dt)
     }
@@ -67,6 +67,10 @@ class FmuWrapper(
 
     override fun close() {
         client?.close()
+
+        localProcess?.apply {
+            waitFor(2000, TimeUnit.MILLISECONDS)
+        }
     }
 
     override fun getInteger(vr: LongArray): IntArray {
@@ -228,8 +232,8 @@ class FmuWrapper(
 }
 
 private class ThriftFmuClient(
-    host: String,
-    port: Int
+        host: String,
+        port: Int
 ) : Closeable {
 
     private val transport = TFramedTransport.Factory()

Diff for: fmu-wrapper/src/main/kotlin/no/ntnu/ihb/fmuproxy/misc/helpers.kt

@@ -12,13 +12,15 @@ import org.apache.thrift.protocol.TBinaryProtocol
 import org.apache.thrift.transport.TFramedTransport
 import org.apache.thrift.transport.TSocket
 import java.io.File
+import java.io.FileInputStream
 import java.io.InputStream
 import java.io.StringReader
 import java.net.ServerSocket
 import java.nio.ByteBuffer
 import java.util.zip.ZipEntry
 import java.util.zip.ZipInputStream
 import javax.xml.bind.JAXB
+import kotlin.concurrent.thread
 
 internal fun String.isLoopback(): Boolean {
     return this == "localhost" || this == "127.0.0.1"
@@ -33,22 +35,24 @@ private fun getAvailablePort(): Int {
 internal fun startRemoteProxy(fmuFile: File, host: String, port: Int): Int {
     //with 150 MB max message size
     val transport = TFramedTransport.Factory(150000000)
-        .getTransport(TSocket(host, port))
+            .getTransport(TSocket(host, port))
     val protocol = TBinaryProtocol(transport)
     val client = FmuService.Client(protocol)
     transport.open()
 
     return if (host.isLoopback()) {
         client.loadFromLocalFile(fmuFile.absolutePath)
     } else {
-        val data = fmuFile.readBytes().let {
-            ByteBuffer.wrap(it)
+        val data = FileInputStream(fmuFile).buffered().use {
+            ByteBuffer.wrap(it.readBytes())
         }
         client.loadFromRemoteFile(fmuFile.name, data)
+    }.also {
+        transport.close()
     }
 }
 
-internal fun startLocalProxy(proxyFile: File, fmuFile: File): Int {
+internal fun startLocalProxy(proxyFile: File, fmuFile: File): Pair<Process, Int> {
 
     require(fmuFile.exists()) { "No such file: $fmuFile" }
     require(proxyFile.exists()) { "No such file: $proxyFile" }
@@ -60,12 +64,20 @@ internal fun startLocalProxy(proxyFile: File, fmuFile: File): Int {
             "$port", fmuFile.absolutePath
     )
 
-    ProcessBuilder().apply {
+    val pb = ProcessBuilder().apply {
         command(*cmd)
-        start()
     }
 
-    return port
+    val process = pb.start()
+    thread(true) {
+        val br = process.inputStream.bufferedReader()
+        while (true) {
+            val read = br.readLine()
+            if (read == null) break else println(read)
+        }
+    }
+
+    return process to port
 }
 
 internal fun extractModelDescriptionXml(stream: InputStream): String {