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

compilation timings

This commit is contained in:
Mark Harrah 2012-06-23 13:52:09 -04:00
parent c9310db337
commit b405110e7b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compile/integration/AggressiveCompile.scala
View File

@ -67,7 +67,9 @@ class AggressiveCompile(cacheFile: File)
{ {
val sources = if(order == Mixed) incSrc else scalaSrcs val sources = if(order == Mixed) incSrc else scalaSrcs
val arguments = cArgs(Nil, absClasspath, outputDirectory, options.options) val arguments = cArgs(Nil, absClasspath, outputDirectory, options.options)
compiler.compile(sources, changes, arguments, callback, maxErrors, cache, log) timed("Scala compilation", log) {
compiler.compile(sources, changes, arguments, callback, maxErrors, cache, log)
}
} }
def compileJava() = def compileJava() =
if(!javaSrcs.isEmpty) if(!javaSrcs.isEmpty)
@ -75,8 +77,12 @@ class AggressiveCompile(cacheFile: File)
import Path._ import Path._
val loader = ClasspathUtilities.toLoader(searchClasspath) val loader = ClasspathUtilities.toLoader(searchClasspath)
def readAPI(source: File, classes: Seq[Class[_]]) { callback.api(source, ClassToAPI(classes)) } def readAPI(source: File, classes: Seq[Class[_]]) { callback.api(source, ClassToAPI(classes)) }
Analyze(outputDirectory, javaSrcs, log)(callback, loader, readAPI) { timed("Java compilation and analysis", log) {
javac.compile(javaSrcs.toArray, absClasspath.toArray, outputDirectory, options.javacOptions.toArray, maxErrors, log) Analyze(outputDirectory, javaSrcs, log)(callback, loader, readAPI) {
timed("Java compilation", log) {
javac.compile(javaSrcs.toArray, absClasspath.toArray, outputDirectory, options.javacOptions.toArray, maxErrors, log)
}
}
} }
} }
if(order == JavaThenScala) { compileJava(); compileScala() } else { compileScala(); compileJava() } if(order == JavaThenScala) { compileJava(); compileScala() } else { compileScala(); compileJava() }
@ -89,6 +95,14 @@ class AggressiveCompile(cacheFile: File)
} }
IncrementalCompile(sourcesSet, entry, compile0, analysis, getAnalysis, outputDirectory, log) IncrementalCompile(sourcesSet, entry, compile0, analysis, getAnalysis, outputDirectory, log)
} }
private[this] def timed[T](label: String, log: Logger)(t: => T): T =
{
val start = System.nanoTime
val result = t
val elapsed = System.nanoTime - start
log.debug(label + " took " + (elapsed/1e9) + " s")
result
}
private[this] def logInputs(log: Logger, javaCount: Int, scalaCount: Int, out: File) private[this] def logInputs(log: Logger, javaCount: Int, scalaCount: Int, out: File)
{ {
val scalaMsg = Util.counted("Scala source", "", "s", scalaCount) val scalaMsg = Util.counted("Scala source", "", "s", scalaCount)