luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4526 from eatkins/cleanup-caffeine 

Cleanup caffeine
This commit is contained in:
eugene yokota 2019-01-30 15:12:00 -05:00 committed by GitHub
parent 6e5caa90c1 ba3ff8198d
commit f170d0c60c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main/src/main/scala/sbt/Main.scala
View File

@ -16,17 +16,18 @@ import sbt.Project.LoadAction
import sbt.compiler.EvalImports import sbt.compiler.EvalImports
import sbt.internal.Aggregation.AnyKeys import sbt.internal.Aggregation.AnyKeys
import sbt.internal.CommandStrings.BootCommand import sbt.internal.CommandStrings.BootCommand
import sbt.internal._
import sbt.internal.inc.ScalaInstance import sbt.internal.inc.ScalaInstance
import sbt.internal.util.Types.{ const, idFun } import sbt.internal.util.Types.{ const, idFun }
import sbt.internal.util.complete.Parser
import sbt.internal.util._ import sbt.internal.util._
import sbt.internal._ import sbt.internal.util.complete.Parser
import sbt.io.syntax._ import sbt.io.syntax._
import sbt.io.{ FileTreeDataView, IO } import sbt.io.{ FileTreeDataView, IO }
import sbt.util.{ Level, Logger, Show } import sbt.util.{ Level, Logger, Show }
import xsbti.compile.CompilerCache import xsbti.compile.CompilerCache
import scala.annotation.tailrec import scala.annotation.tailrec
import scala.concurrent.ExecutionContext
import scala.util.control.NonFatal import scala.util.control.NonFatal
/** This class is the entry point for sbt. */ /** This class is the entry point for sbt. */
@ -85,13 +86,15 @@ final class ConsoleMain extends xsbti.AppMain {
object StandardMain { object StandardMain {
private[sbt] lazy val exchange = new CommandExchange() private[sbt] lazy val exchange = new CommandExchange()
import scalacache._
import scalacache.caffeine._ import scalacache.caffeine._
private[sbt] lazy val cache: Cache[Any] = CaffeineCache[Any] private[sbt] lazy val cache: scalacache.Cache[Any] = CaffeineCache[Any]
private[sbt] val shutdownHook = new Thread(() => { private[this] val closeRunnable: Runnable = () => {
exchange.shutdown cache.close()(scalacache.modes.sync.mode)
}) cache.close()(scalacache.modes.scalaFuture.mode(ExecutionContext.global))
exchange.shutdown()
}
private[sbt] val shutdownHook = new Thread(closeRunnable)
def runManaged(s: State): xsbti.MainResult = { def runManaged(s: State): xsbti.MainResult = {
val previous = TrapExit.installManager() val previous = TrapExit.installManager()
@ -106,7 +109,7 @@ object StandardMain {
try { try {
MainLoop.runLogged(s) MainLoop.runLogged(s)
} finally { } finally {
exchange.shutdown closeRunnable.run()
if (hooked) { if (hooked) {
Runtime.getRuntime.removeShutdownHook(shutdownHook) Runtime.getRuntime.removeShutdownHook(shutdownHook)
} }

2
main/src/main/scala/sbt/internal/server/Definition.scala
View File

@ -227,7 +227,7 @@ private[sbt] object Definition {
val cacheFile = compileIncSetup.value.cacheFile.getAbsolutePath val cacheFile = compileIncSetup.value.cacheFile.getAbsolutePath
val useBinary = enableBinaryCompileAnalysis.value val useBinary = enableBinaryCompileAnalysis.value
val s = state.value val s = state.value
s.log.debug(s"analysis location ${(cacheFile -> useBinary)}") s.log.debug(s"analysis location ${cacheFile -> useBinary}")
import scalacache.modes.sync._ import scalacache.modes.sync._
updateCache(StandardMain.cache)(cacheFile, useBinary) updateCache(StandardMain.cache)(cacheFile, useBinary)
} }