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

replace thin spaces with regular spaces (to make diagrams look good) (#20696)

Browse source
This commit is contained in:
2beaucoup 2016-06-02 11:38:34 +02:00 • committed by Konrad Malawski
parent 609fb0ec03
commit 02904212bd
3 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

24
akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolConductor.scala
View file

@ -44,22 +44,22 @@ private object PoolConductor {
/* /*
Stream Setup Stream Setup
============ ============
                                           Request- Request-
Request- +-----------+ +-----------+   Switch-   +-------------+    +-----------+  Context Request- +-----------+ +-----------+ Switch- +-------------+ +-----------+ Context
Context |  retry | |  slot- |   Command  | doubler |    |  route  +--------------> Context | retry | | slot- | Command | doubler | | route +-------------->
+--------->| Merge +---->| Selector +-------------->| (MapConcat) +---->|  (Flexi  +--------------> +--------->| Merge +---->| Selector +-------------->| (MapConcat) +---->| (Flexi +-------------->
| |  | |    | |    |  Route) +--------------> | | | | | | | Route) +-------------->
+----+------+ +-----+-----+             +-------------+    +-----------+     to slots +----+------+ +-----+-----+ +-------------+ +-----------+ to slots
  ^     ^ ^ ^
| | SlotEvent | | SlotEvent
| +----+----+ | +----+----+
| | flatten | mapAsync | | flatten | mapAsync
| +----+----+ | +----+----+
  |     | RawSlotEvent | | RawSlotEvent
  | Request-    | | Request- |
| Context +---------+ | Context +---------+
+-------------+  retry |<-------- RawSlotEvent (from slotEventMerge) +-------------+ retry |<-------- RawSlotEvent (from slotEventMerge)
|  Split  | | Split |
+---------+ +---------+
*/ */

44
akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolFlow.scala
View file

@ -26,28 +26,28 @@ private object PoolFlow {
/* /*
Pool Flow Stream Setup Pool Flow Stream Setup
====================== ======================
                                 +-------------------+                              +-------------------+
                                     |                   |                              | |
                              +----> | Connection Slot 1 +---->                         +----> | Connection Slot 1 +---->
                              |      |                   |    |                         | | | |
                              |      +---+---------------+    |                         | +---+---------------+ |
                              |          |                    |                         | | |
             +-----------+    |      +-------------------+    |      +---------------+ +-----------+ | +-------------------+ | +---------------+
RequestContext   |           +----+      |                   |    +----> |               | ResponseContext RequestContext | +----+ | | +----> | | ResponseContext
+----------------> | Conductor |---------> | Connection Slot 2 +---------> | responseMerge +------------------> +----------------> | Conductor |---------> | Connection Slot 2 +---------> | responseMerge +------------------>
             |           +----+      |                   |    +----> |               | | +----+ | | +----> | |
             +-----------+    |      +---------+---------+    |      +---------------+ +-----------+ | +---------+---------+ | +---------------+
                   ^         |          |     |              |                         ^ | | | |
                   |         |      +-------------------+    |                         | | +-------------------+ |
         |         |      |                   |    |                         | | | | |
          RawSlotEvent |         +----> | Connection Slot 3 +---->                         RawSlotEvent | +----> | Connection Slot 3 +---->
                   |                |                   |                              | | |
                   |                +---------------+---+                              | +---------------+---+
              |    |     |     |                                     | | | |
+-----------+ RawSlotEvent |     |     |  +-----------+ RawSlotEvent | | |
             | slotEvent | <-------------+     |     | | slotEvent | <-------------+ | |
             |  Merge  | <-------------------+     |                                   | Merge | <-------------------+ |
             |           | <-------------------------+                                   | | <-------------------------+
+-----------+ +-----------+
Conductor: Conductor:

16
akka-http-core/src/main/scala/akka/http/impl/engine/client/PoolSlot.scala
View file

@ -37,15 +37,15 @@ private object PoolSlot {
Stream Setup Stream Setup
============ ============
Request-  +-----------+  +-------------+  +-------------+    +------------+ Request- +-----------+ +-------------+ +-------------+ +------------+
Context  | Slot-     |  List[ | flatten | Processor-  | doubler |    | SlotEvent- |  Response- Context | Slot- | List[ | flatten | Processor- | doubler | | SlotEvent- | Response-
+--------->| Processor +------------->| (MapConcat) +------------->| (MapConcat) +---->| Split      +-------------> +--------->| Processor +------------->| (MapConcat) +------------->| (MapConcat) +---->| Split +------------->
          |           |  Processor- | | Out  | |    |            |  Context | | Processor- | | Out | | | | Context
          +-----------+  Out] +-------------+ +-------------+    +-----+------+ +-----------+ Out] +-------------+ +-------------+ +-----+------+
                         | RawSlotEvent | RawSlotEvent
                 | (to Conductor | (to Conductor
| via slotEventMerge) | via slotEventMerge)
                             v v
*/ */
def apply(slotIx: Int, connectionFlow: Flow[HttpRequest, HttpResponse, Any], def apply(slotIx: Int, connectionFlow: Flow[HttpRequest, HttpResponse, Any],
settings: ConnectionPoolSettings)(implicit system: ActorSystem, settings: ConnectionPoolSettings)(implicit system: ActorSystem,