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

Cleanup user thread task submission 

I found this code difficult to reason about so I refactored it so that
it was easier for me to understand.
This commit is contained in:
Ethan Atkins 2020-11-19 18:44:58 -08:00
parent 600628e8e9
commit 2b45183d09
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main-command/src/main/scala/sbt/internal/ui/UserThread.scala
View File

@ -31,31 +31,33 @@ private[sbt] class UserThread(val channel: CommandChannel) extends AutoCloseable
private[sbt] def reset(state: State): Unit = if (!isClosed.get) {
uiThread.synchronized {
val task = channel.makeUIThread(state)
def submit(): Thread = {
def submit(): Unit = {
val thread: Thread = new Thread(s"sbt-$name-ui-thread") {
setDaemon(true)
override def run(): Unit =
try task.run()
finally uiThread.get match {
case (_, t) if t == this => uiThread.set(null)
case _ =>
finally {
uiThread.getAndSet(null) match {
case prev @ (_, th) if th != this => uiThread.set(prev)
case _ =>
}
}
}
uiThread.getAndSet((task, thread)) match {
case null => thread.start()
case (task, t) if t.getClass != task.getClass =>
stopThreadImpl()
case (prevTask, prevThread) if prevTask.getClass != task.getClass =>
prevTask.close()
prevThread.joinFor(1.second)
thread.start()
case t => uiThread.set(t)
}
thread
}
uiThread.get match {
case null => uiThread.set((task, submit()))
case (t, _) if t.getClass == task.getClass =>
case null => submit()
case (prevTask, _) if prevTask.getClass == task.getClass =>
case (t, thread) =>
stopThreadImpl()
uiThread.set((task, submit()))
submit()
}
}
Option(lastProgressEvent.get).foreach(onProgressEvent)