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

Schedule timer for remaining delayed elements #22416

Browse source
This commit is contained in:
Thomas Alton 2017-03-30 09:27:01 -05:00 • committed by Johan Andrén
parent 2714dca5e1
commit 626d07edca
2 changed files with 31 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala
View file

@ -1486,6 +1486,8 @@ private[stream] object Collect {
@InternalApi private[akka] final class Delay[T](val d: FiniteDuration, val strategy: DelayOverflowStrategy) extends SimpleLinearGraphStage[T] {
private[this] def timerName = "DelayedTimer"
final val DelayPrecisionMS = 10
override def initialAttributes: Attributes = DefaultAttributes.delay
override def createLogic(inheritedAttributes: Attributes): GraphStageLogic = new TimerGraphStageLogic(shape) with InHandler with OutHandler {
@ -1563,8 +1565,14 @@ private[stream] object Collect {
completeIfReady()
def onPull(): Unit = {
if (!isTimerActive(timerName) && !buffer.isEmpty && nextElementWaitTime() < 0)
push(out, buffer.dequeue()._2)
if (!isTimerActive(timerName) && !buffer.isEmpty) {
val waitTime = nextElementWaitTime()
if (waitTime < 0) {
push(out, buffer.dequeue()._2)
} else {
scheduleOnce(timerName, Math.max(DelayPrecisionMS, waitTime).millis)
}
}
if (!isClosed(in) && !hasBeenPulled(in) && pullCondition)
pull(in)
@ -1587,7 +1595,7 @@ private[stream] object Collect {
if (!buffer.isEmpty) {
val waitTime = nextElementWaitTime()
if (waitTime > 10)
if (waitTime > DelayPrecisionMS)
scheduleOnce(timerName, waitTime.millis)
}
completeIfReady()