-
Notifications
You must be signed in to change notification settings - Fork 202
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #260 from scalacenter/topic/remove-in-process
Remove in process run and test
- Loading branch information
Showing
25 changed files
with
286 additions
and
554 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package bloop.exec | ||
|
|
||
| import java.io.File.{separator, pathSeparator} | ||
| import java.lang.ClassLoader | ||
| import java.nio.file.Files | ||
| import java.net.URLClassLoader | ||
| import java.util.concurrent.ConcurrentHashMap | ||
|
|
||
| import scala.util.control.NonFatal | ||
|
|
||
| import bloop.io.AbsolutePath | ||
| import bloop.logging.{Logger, ProcessLogger} | ||
|
|
||
| /** | ||
| * Configuration to start a new JVM to execute Java code. | ||
| * | ||
| * @param javaEnv The configuration describing how to start the new JVM. | ||
| * @param classpath The full classpath with which the code should be executed. | ||
| */ | ||
| final case class ForkProcess(javaEnv: JavaEnv, classpath: Array[AbsolutePath]) { | ||
|
|
||
| /** | ||
| * Creates a `ClassLoader` from the classpath of this `ForkProcess`. | ||
| * | ||
| * @param parent A parent classloader | ||
| * @return A classloader constructed from the classpath of this `ForkProcess`. | ||
| */ | ||
| def toExecutionClassLoader(parent: Option[ClassLoader]): ClassLoader = { | ||
| def makeNew(parent: Option[ClassLoader]): ClassLoader = { | ||
| val classpathEntries = classpath.map(_.underlying.toUri.toURL) | ||
| new URLClassLoader(classpathEntries, parent.orNull) | ||
| } | ||
| ForkProcess.classLoaderCache.computeIfAbsent(parent, makeNew) | ||
| } | ||
|
|
||
| /** | ||
| * Run the main function in class `className`, passing it `args`. | ||
| * | ||
| * @param cwd The directory in which to start the forked JVM. | ||
| * @param className The fully qualified name of the class to run. | ||
| * @param args The arguments to pass to the main method. | ||
| * @param logger Where to log the messages from execution. | ||
| * @param extraClasspath Paths to append to the classpath before running. | ||
| * @return 0 if the execution exited successfully, a non-zero number otherwise. | ||
| */ | ||
| def runMain(cwd: AbsolutePath, | ||
| className: String, | ||
| args: Array[String], | ||
| logger: Logger, | ||
| extraClasspath: Array[AbsolutePath] = Array.empty): Int = { | ||
| val fullClasspath = classpath ++ extraClasspath | ||
|
|
||
| val java = javaEnv.javaHome.resolve("bin").resolve("java") | ||
| val classpathOption = "-cp" :: fullClasspath.map(_.syntax).mkString(pathSeparator) :: Nil | ||
| val appOptions = className :: args.toList | ||
| val cmd = java.syntax :: javaEnv.javaOptions.toList ::: classpathOption ::: appOptions | ||
|
|
||
| logger.debug(s"Running '$className' in a new JVM.") | ||
| logger.debug(s" java_home = '${javaEnv.javaHome}'") | ||
| logger.debug(s" javaOptions = '${javaEnv.javaOptions.mkString(" ")}'") | ||
| logger.debug(s" classpath = '${fullClasspath.map(_.syntax).mkString(pathSeparator)}'") | ||
| logger.debug(s" command = '${cmd.mkString(" ")}'") | ||
| logger.debug(s" cwd = '$cwd'") | ||
|
|
||
| if (!Files.exists(cwd.underlying)) { | ||
| logger.error(s"Couldn't start the forked JVM because '$cwd' doesn't exist.") | ||
| ForkProcess.EXIT_ERROR | ||
| } else { | ||
| val processBuilder = new ProcessBuilder(cmd: _*) | ||
| processBuilder.directory(cwd.toFile) | ||
| val process = processBuilder.start() | ||
| val processLogger = new ProcessLogger(logger, process) | ||
| processLogger.start() | ||
| val exitCode = process.waitFor() | ||
| logger.debug(s"Forked JVM exited with code: $exitCode") | ||
|
|
||
| exitCode | ||
| } | ||
| } | ||
| } | ||
|
|
||
| object ForkProcess { | ||
|
|
||
| private val classLoaderCache: ConcurrentHashMap[Option[ClassLoader], ClassLoader] = | ||
| new ConcurrentHashMap | ||
|
|
||
| /** The code returned after a successful execution. */ | ||
| final val EXIT_OK = 0 | ||
|
|
||
| /** The code returned after the execution errored. */ | ||
| final val EXIT_ERROR = 1 | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 0 additions & 84 deletions
84
frontend/src/main/scala/bloop/exec/MultiplexedStreams.scala
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.