raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge pull request #1482 from akka/wip-3378-fix-memory-leak-in-lars-stop-√

Browse source 
#3378 - fixing memory leak in LARS.stop
This commit is contained in:
Viktor Klang (√) 2013-05-27 01:54:25 -07:00
commit 8e54ff4722
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-actor/src/main/scala/akka/actor/Scheduler.scala
View file

@ -348,14 +348,16 @@ class LightArrayRevolverScheduler(config: Config,
}
private val stopped = new AtomicReference[Promise[immutable.Seq[TimerTask]]]
def stop(): Future[immutable.Seq[TimerTask]] =
if (stopped.compareAndSet(null, Promise())) {
def stop(): Future[immutable.Seq[TimerTask]] = {
val p = Promise[immutable.Seq[TimerTask]]()
if (stopped.compareAndSet(null, p)) {
// Interrupting the timer thread to make it shut down faster is not good since
// it could be in the middle of executing the scheduled tasks, which might not
// respond well to being interrupted.
// Instead we just wait one more tick for it to finish.
stopped.get.future
p.future
} else Future.successful(Nil)
}
private def clearAll(): immutable.Seq[TimerTask] = {
def collect(curr: TaskHolder, acc: Vector[TimerTask]): Vector[TimerTask] = {
@ -383,7 +385,9 @@ class LightArrayRevolverScheduler(config: Config,
case e: Throwable ⇒ log.error(e, "LARS cannot start new thread, ship’s going down!")
}
timerThread = thread
case x ⇒ x success clearAll()
case p ⇒
assert(stopped.compareAndSet(p, Promise successful Nil), "Stop signal violated in LARS")
p success clearAll()
}
throw t
}