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

add fusing

Browse source
This commit is contained in:
Roland Kuhn 2015-12-14 17:02:00 +01:00
parent 0fb6654f4f
commit a20bbce433
64 changed files with 1397 additions and 534 deletions
Download patch file Download diff file Expand all files Collapse all files

41
akka-stream/src/main/scala/akka/stream/impl/fusing/GraphInterpreter.scala
View file

@ -4,14 +4,17 @@
package akka.stream.impl.fusing
import java.util.Arrays
import akka.event.LoggingAdapter
import akka.stream.stage._
import scala.annotation.tailrec
import scala.collection.immutable
import akka.stream._
import akka.stream.impl.StreamLayout._
import akka.stream.impl.fusing.GraphStages.MaterializedValueSource
import scala.concurrent.forkjoin.ThreadLocalRandom
import scala.util.control.NonFatal
import java.{ util ⇒ ju }
import akka.stream.impl.fusing.GraphStages.MaterializedValueSource
/**
* INTERNAL API
@ -113,9 +116,11 @@ private[stream] object GraphInterpreter {
* - array of the logics
* - materialized value
*/
def materialize(inheritedAttributes: Attributes): (Array[InHandler], Array[OutHandler], Array[GraphStageLogic], Any) = {
def materialize(inheritedAttributes: Attributes,
copiedModules: Array[Module],
matVal: ju.Map[Module, Any],
register: MaterializedValueSource[Any] ⇒ Unit): (Array[InHandler], Array[OutHandler], Array[GraphStageLogic]) = {
val logics = Array.ofDim[GraphStageLogic](stages.length)
var finalMat: Any = ()
var i = 0
while (i < stages.length) {
@ -140,10 +145,16 @@ private[stream] object GraphInterpreter {
idx += 1
}
// FIXME: Support for materialized values in fused islands is not yet figured out!
val logicAndMat = stages(i).createLogicAndMaterializedValue(inheritedAttributes and originalAttributes(i))
// FIXME: Current temporary hack to support non-fused stages. If there is one stage that will be under index 0.
if (i == 0) finalMat = logicAndMat._2
val stage = stages(i) match {
case mv: MaterializedValueSource[_] ⇒
val copy = mv.copySrc.asInstanceOf[MaterializedValueSource[Any]]
register(copy)
copy
case x ⇒ x
}
val logicAndMat = stage.createLogicAndMaterializedValue(inheritedAttributes and originalAttributes(i))
matVal.put(copiedModules(i), logicAndMat._2)
logics(i) = logicAndMat._1
i += 1
@ -174,17 +185,17 @@ private[stream] object GraphInterpreter {
i += 1
}
(inHandlers, outHandlers, logics, finalMat)
(inHandlers, outHandlers, logics)
}
override def toString: String =
"GraphAssembly(" +
stages.mkString("[", ",", "]") + ", " +
ins.mkString("[", ",", "]") + ", " +
inOwners.mkString("[", ",", "]") + ", " +
outs.mkString("[", ",", "]") + ", " +
outOwners.mkString("[", ",", "]") +
")"
"GraphAssembly\n " +
stages.mkString("[", ",", "]") + "\n " +
originalAttributes.mkString("[", ",", "]") + "\n " +
ins.mkString("[", ",", "]") + "\n " +
inOwners.mkString("[", ",", "]") + "\n " +
outs.mkString("[", ",", "]") + "\n " +
outOwners.mkString("[", ",", "]")
}
object GraphAssembly {