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

Merge pull request #5889 from eatkins/supershell-perf-regression-fix 

Fix minor supershell performance regression
This commit is contained in:
eugene yokota 2020-09-25 14:13:12 -04:00 committed by GitHub
parent a79ef52f74 d930cb1987
commit 71677cedca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main/src/main/scala/sbt/internal/TaskProgress.scala
View File

@ -48,8 +48,9 @@ private[sbt] class TaskProgress(
val delay = duration.toMillis val delay = duration.toMillis
try { try {
val future = val future =
if (recurring) scheduler.schedule(runnable, delay, TimeUnit.MILLISECONDS) if (recurring)
else scheduler.scheduleAtFixedRate(runnable, delay, delay, TimeUnit.MILLISECONDS) scheduler.scheduleAtFixedRate(runnable, delay, delay, TimeUnit.MILLISECONDS)
else scheduler.schedule(runnable, delay, TimeUnit.MILLISECONDS)
pending.add(future) pending.add(future)
() => Util.ignoreResult(future.cancel(true)) () => Util.ignoreResult(future.cancel(true))
} catch { } catch {
@ -106,10 +107,15 @@ private[sbt] class TaskProgress(
override def afterReady(task: Task[_]): Unit = override def afterReady(task: Task[_]): Unit =
if (!closed.get) { if (!closed.get) {
if (skipReportTasks.contains(getShortName(task))) { try {
lastTaskCount.set(-1) // force a report for remote clients Util.ignoreResult(executor.submit((() => {
report() if (skipReportTasks.contains(getShortName(task))) {
} else Util.ignoreResult(active.put(task, schedule(threshold, recurring = false)(doReport()))) lastTaskCount.set(-1) // force a report for remote clients
report()
} else
Util.ignoreResult(active.put(task, schedule(threshold, recurring = false)(doReport())))
}): Runnable))
} catch { case _: RejectedExecutionException => }
} else { } else {
logger.debug(s"called afterReady for ${taskName(task)} after task progress was closed") logger.debug(s"called afterReady for ${taskName(task)} after task progress was closed")
} }