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

Renamed: 

sbt.task.timings.shutdown -> sbt.task.timings.on.shutdown
 sbt.task.timings.divider -> sbt.task.timings.unit
This commit is contained in:
David Perez 2015-09-17 08:44:37 +02:00 committed by Eugene Yokota
parent 4f5c5c92a2
commit 6ab0bc403a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/EvaluateTask.scala
View File

@ -154,7 +154,7 @@ object EvaluateTask {
private[sbt] def defaultProgress: ExecuteProgress[Task] =
if (java.lang.Boolean.getBoolean("sbt.task.timings")) {
if (java.lang.Boolean.getBoolean("sbt.task.timings.shutdown"))
if (java.lang.Boolean.getBoolean("sbt.task.timings.on.shutdown"))
sharedProgress
else
new TaskTimings(shutdown = false)

19
main/src/main/scala/sbt/internal/TaskTimings.scala
View File

@ -10,8 +10,8 @@ import TaskName._
* Measure the time elapsed for running tasks.
* This class is activated by adding -Dsbt.task.timing=true to the JVM options.
* Formatting options:
* - -Dsbt.task.timings.shutdown=true|false
* - -Dsbt.task.timings.decimals=number
* - -Dsbt.task.timings.on.shutdown=true|false
* - -Dsbt.task.timings.unit=number
* - -Dsbt.task.timings.threshold=number
* @param shutdown Should the report be given when exiting the JVM (true) or immediatelly (false)?
*/
@ -20,14 +20,15 @@ private[sbt] final class TaskTimings(shutdown: Boolean) extends ExecuteProgress[
private[this] val anonOwners = new ConcurrentHashMap[Task[_], Task[_]]
private[this] val timings = new ConcurrentHashMap[Task[_], Long]
private[this] var start = 0L
private[this] val divider = java.lang.Integer.getInteger("sbt.task.timings.divider", 6).toInt
private[this] val threshold = java.lang.Long.getLong("sbt.task.timings.threshold", 0L)
private[this] val unit = divider match {
case 0 => "ns"
case 3 => "µs"
case 6 => "ms"
case 9 => "sec"
case _ => ""
private[this] val (unit, divider) = System.getProperty("sbt.task.timings.unit", "ms") match {
case "ns" => ("ns", 0)
case "us" => ("µs", 3)
case "ms" => ("ms", 6)
case "s" => ("sec", 9)
case x =>
System.err.println(s"Unknown sbt.task.timings.unit: $x.\nUsing milliseconds.")
("ms", 6)
}
type S = Unit