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

Fallback to ProcessBuilder when native ProcessLauncher fails

Browse Source 
#KT-16902 fixed
This commit is contained in:
Alexey Tsvetkov
2017-03-20 16:35:07 +03:00
parent 9d95c841a6
commit 0a4c43a5f1
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/KotlinCompilerClient.kt
+10 -2
View File
@@ -17,6 +17,7 @@
package org.jetbrains.kotlin.daemon.client package org.jetbrains.kotlin.daemon.client
import net.rubygrapefruit.platform.Native import net.rubygrapefruit.platform.Native
import net.rubygrapefruit.platform.NativeException
import net.rubygrapefruit.platform.ProcessLauncher import net.rubygrapefruit.platform.ProcessLauncher
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
@@ -386,8 +387,15 @@ object KotlinCompilerClient {
val processBuilder = ProcessBuilder(args) val processBuilder = ProcessBuilder(args)
processBuilder.redirectErrorStream(true) processBuilder.redirectErrorStream(true)
// assuming daemon process is deaf and (mostly) silent, so do not handle streams // assuming daemon process is deaf and (mostly) silent, so do not handle streams
val daemonLauncher = Native.get(ProcessLauncher::class.java) val daemon =
val daemon = daemonLauncher.start(processBuilder) try {
val nativeLauncher = Native.get(ProcessLauncher::class.java)
nativeLauncher.start(processBuilder)
}
catch (e: NativeException) {
reportingTargets.report(DaemonReportCategory.DEBUG, "Could not start daemon with native process launcher, falling back to ProcessBuilder#start")
processBuilder.start()
}
val isEchoRead = Semaphore(1) val isEchoRead = Semaphore(1)
isEchoRead.acquire() isEchoRead.acquire()