From 7c5dc31d1acd323feb13fd4e611df707245c468c Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Sun, 18 Oct 2020 21:38:30 +0100
Subject: [PATCH] docs: update diagram 2

---
 design/server.gv  |  2 +-
 design/server.svg | 77 +++++++++++++++++++++++------------------------
 2 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/design/server.gv b/design/server.gv
index 42816d43c..5823a8af6 100644
--- a/design/server.gv
+++ b/design/server.gv
@@ -52,6 +52,6 @@ digraph SMPServer {
     client -> subscriber [style=dashed label="1 fork per\nSMP queue/\nconnection" color=orange]
     client -> msgQueues [dir="both" label="SEND,\nSUB,\nACK" color=green]
     client -> outq -> send -> cs [color=blue]
-    client -> subscribedQ [label="(rId,\nClient)"]
+    client -> subscribedQ [label="(rId, Client)"]
   }
 }
diff --git a/design/server.svg b/design/server.svg
index 72b472be7..50339a320 100644
--- a/design/server.svg
+++ b/design/server.svg
@@ -4,11 +4,11 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: SMPServer Pages: 1 -->
-<svg width="889pt" height="689pt"
- viewBox="0.00 0.00 889.00 689.40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 685.3999)">
+<svg width="889pt" height="677pt"
+ viewBox="0.00 0.00 889.00 677.40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 673.3999)">
 <title>SMPServer</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-685.3999 885,-685.3999 885,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-673.3999 885,-673.3999 885,4 -4,4"/>
 <g id="clust1" class="cluster">
 <title>clusterPersistence</title>
 <polygon fill="none" stroke="#000000" points="671,-112.175 671,-200.275 873,-200.275 873,-112.175 671,-112.175"/>
@@ -16,8 +16,8 @@
 </g>
 <g id="clust2" class="cluster">
 <title>clusterServer</title>
-<polygon fill="none" stroke="#000000" points="8,-356.4499 8,-673.3999 314,-673.3999 314,-356.4499 8,-356.4499"/>
-<text text-anchor="middle" x="161" y="-656.7999" font-family="arial" font-size="14.00" fill="#000000">server threads</text>
+<polygon fill="none" stroke="#000000" points="8,-356.4499 8,-661.3999 314,-661.3999 314,-356.4499 8,-356.4499"/>
+<text text-anchor="middle" x="161" y="-644.7999" font-family="arial" font-size="14.00" fill="#000000">server threads</text>
 </g>
 <g id="clust3" class="cluster">
 <title>clusterThreads</title>
@@ -25,8 +25,8 @@
 </g>
 <g id="clust5" class="cluster">
 <title>clusterConnection</title>
-<polygon fill="none" stroke="#000000" points="322,-8 322,-557.4249 663,-557.4249 663,-8 322,-8"/>
-<text text-anchor="middle" x="492.5" y="-540.8249" font-family="arial" font-size="14.00" fill="#000000">1 group per client connection</text>
+<polygon fill="none" stroke="#000000" points="322,-8 322,-545.4249 663,-545.4249 663,-8 322,-8"/>
+<text text-anchor="middle" x="492.5" y="-528.8249" font-family="arial" font-size="14.00" fill="#000000">1 group per client connection</text>
 </g>
 <g id="clust6" class="cluster">
 <title>clusterThreads</title>
@@ -65,9 +65,9 @@
 <!-- main -->
 <g id="node3" class="node">
 <title>main</title>
-<polygon fill="none" stroke="#ffa500" points="93.542,-612.5124 74.271,-640.6876 35.729,-640.6876 16.458,-612.5124 35.729,-584.3371 74.271,-584.3371 93.542,-612.5124"/>
-<text text-anchor="middle" x="55" y="-615.8124" font-family="arial" font-size="11.00" fill="#000000">main</text>
-<text text-anchor="middle" x="55" y="-602.6124" font-family="arial" font-size="11.00" fill="#000000">thread</text>
+<polygon fill="none" stroke="#ffa500" points="93.542,-600.5124 74.271,-628.6876 35.729,-628.6876 16.458,-600.5124 35.729,-572.3371 74.271,-572.3371 93.542,-600.5124"/>
+<text text-anchor="middle" x="55" y="-603.8124" font-family="arial" font-size="11.00" fill="#000000">main</text>
+<text text-anchor="middle" x="55" y="-590.6124" font-family="arial" font-size="11.00" fill="#000000">thread</text>
 </g>
 <!-- runClient -->
 <g id="node5" class="node">
@@ -79,9 +79,9 @@
 <!-- main&#45;&gt;runClient -->
 <g id="edge1" class="edge">
 <title>main&#45;&gt;runClient</title>
-<path fill="none" stroke="#ffa500" stroke-dasharray="5,2" d="M82.1578,-595.3725C97.1002,-585.2756 115.4954,-571.7076 130,-557.4249 167.6779,-520.3234 203.2683,-470.7813 225.5388,-437.3766"/>
-<polygon fill="#ffa500" stroke="#ffa500" points="231.1821,-428.8283 229.4281,-439.653 228.4274,-433.001 225.6727,-437.1738 225.6727,-437.1738 225.6727,-437.1738 228.4274,-433.001 221.9172,-434.6945 231.1821,-428.8283 231.1821,-428.8283"/>
-<text text-anchor="middle" x="198.7235" y="-503.6249" font-family="arial" font-size="10.00" fill="#ffa500">race</text>
+<path fill="none" stroke="#ffa500" stroke-dasharray="5,2" d="M82.4126,-583.8786C98.0501,-573.7433 117.5501,-559.9715 133,-545.4249 168.3831,-512.1106 202.3371,-467.7613 224.2648,-436.9423"/>
+<polygon fill="#ffa500" stroke="#ffa500" points="230.1218,-428.629 228.041,-439.3957 227.2421,-432.7164 224.3623,-436.8039 224.3623,-436.8039 224.3623,-436.8039 227.2421,-432.7164 220.6836,-434.2121 230.1218,-428.629 230.1218,-428.629"/>
+<text text-anchor="middle" x="203.7235" y="-491.6249" font-family="arial" font-size="10.00" fill="#ffa500">race</text>
 </g>
 <!-- server -->
 <g id="node6" class="node">
@@ -93,34 +93,34 @@
 <!-- main&#45;&gt;server -->
 <g id="edge2" class="edge">
 <title>main&#45;&gt;server</title>
-<path fill="none" stroke="#ffa500" stroke-dasharray="5,2" d="M66.6857,-584.3637C82.3006,-546.7505 110.0166,-479.9881 127.4019,-438.1102"/>
-<polygon fill="#ffa500" stroke="#ffa500" points="131.2659,-428.8025 131.5878,-439.7636 129.3488,-433.4204 127.4317,-438.0382 127.4317,-438.0382 127.4317,-438.0382 129.3488,-433.4204 123.2756,-436.3128 131.2659,-428.8025 131.2659,-428.8025"/>
-<text text-anchor="middle" x="116.7235" y="-503.6249" font-family="arial" font-size="10.00" fill="#ffa500">race</text>
+<path fill="none" stroke="#ffa500" stroke-dasharray="5,2" d="M67.4216,-572.285C82.8393,-537.2492 109.19,-477.3686 126.3476,-438.379"/>
+<polygon fill="#ffa500" stroke="#ffa500" points="130.4994,-428.9443 130.5904,-439.9098 128.4855,-433.5208 126.4715,-438.0972 126.4715,-438.0972 126.4715,-438.0972 128.4855,-433.5208 122.3527,-436.2847 130.4994,-428.9443 130.4994,-428.9443"/>
+<text text-anchor="middle" x="119.7235" y="-491.6249" font-family="arial" font-size="10.00" fill="#ffa500">race</text>
 </g>
 <!-- ss -->
 <g id="node4" class="node">
 <title>ss</title>
-<polygon fill="none" stroke="#0000ff" points="218.4518,-630.5124 111.5482,-630.5124 111.5482,-594.5124 218.4518,-594.5124 218.4518,-630.5124"/>
-<text text-anchor="middle" x="165" y="-609.2124" font-family="arial" font-size="11.00" fill="#000000">server TCP socket</text>
+<polygon fill="none" stroke="#0000ff" points="218.4518,-618.5124 111.5482,-618.5124 111.5482,-582.5124 218.4518,-582.5124 218.4518,-618.5124"/>
+<text text-anchor="middle" x="165" y="-597.2124" font-family="arial" font-size="11.00" fill="#000000">server TCP socket</text>
 </g>
 <!-- ss&#45;&gt;runClient -->
 <g id="edge3" class="edge">
 <title>ss&#45;&gt;runClient</title>
-<path fill="none" stroke="#0000ff" d="M190.6974,-594.3677C202.3984,-584.7367 215.3212,-571.9016 223,-557.4249 242.6119,-520.4509 248.114,-472.2524 249.3398,-439.0882"/>
-<polygon fill="#0000ff" stroke="#0000ff" points="249.6001,-428.8821 253.8436,-438.9936 249.4726,-433.8805 249.3451,-438.8788 249.3451,-438.8788 249.3451,-438.8788 249.4726,-433.8805 244.8465,-438.7641 249.6001,-428.8821 249.6001,-428.8821"/>
+<path fill="none" stroke="#0000ff" d="M190.6135,-582.3228C202.2946,-572.6811 215.2249,-559.8501 223,-545.4249 240.8424,-512.3216 246.7634,-469.4031 248.5729,-438.8905"/>
+<polygon fill="#0000ff" stroke="#0000ff" points="249.0542,-428.6517 253.0796,-438.852 248.8194,-433.6461 248.5845,-438.6406 248.5845,-438.6406 248.5845,-438.6406 248.8194,-433.6461 244.0895,-438.4293 249.0542,-428.6517 249.0542,-428.6517"/>
 </g>
 <!-- cs -->
 <g id="node8" class="node">
 <title>cs</title>
-<polygon fill="none" stroke="#0000ff" points="552.8099,-524.6249 395.1901,-524.6249 395.1901,-488.6249 552.8099,-488.6249 552.8099,-524.6249"/>
-<text text-anchor="middle" x="474" y="-503.3249" font-family="arial" font-size="11.00" fill="#000000">client connection TCP socket</text>
+<polygon fill="none" stroke="#0000ff" points="552.8099,-512.6249 395.1901,-512.6249 395.1901,-476.6249 552.8099,-476.6249 552.8099,-512.6249"/>
+<text text-anchor="middle" x="474" y="-491.3249" font-family="arial" font-size="11.00" fill="#000000">client connection TCP socket</text>
 </g>
 <!-- runClient&#45;&gt;cs -->
 <g id="edge5" class="edge">
 <title>runClient&#45;&gt;cs</title>
-<path fill="none" stroke="#0000ff" stroke-dasharray="5,2" d="M266.9422,-428.7324C277.6982,-443.3874 292.6446,-460.3387 309.985,-470.6249 323.277,-478.5096 353.6924,-486.0383 384.7675,-492.1534"/>
-<polygon fill="#0000ff" stroke="#0000ff" points="394.8591,-494.0878 384.1907,-496.6247 389.9485,-493.1465 385.0379,-492.2052 385.0379,-492.2052 385.0379,-492.2052 389.9485,-493.1465 385.8851,-487.7856 394.8591,-494.0878 394.8591,-494.0878"/>
-<text text-anchor="middle" x="326.5075" y="-455.6249" font-family="arial" font-size="10.00" fill="#0000ff">connect</text>
+<path fill="none" stroke="#0000ff" stroke-dasharray="5,2" d="M272.5995,-428.901C283.0081,-439.7165 296.0409,-451.2129 309.985,-458.6249 332.9376,-470.8253 359.7984,-478.8942 385.0605,-484.2295"/>
+<polygon fill="#0000ff" stroke="#0000ff" points="395.0232,-486.2129 384.337,-488.6737 390.1195,-485.2366 385.2157,-484.2603 385.2157,-484.2603 385.2157,-484.2603 390.1195,-485.2366 386.0944,-479.8469 395.0232,-486.2129 395.0232,-486.2129"/>
+<text text-anchor="middle" x="326.5075" y="-449.6249" font-family="arial" font-size="10.00" fill="#0000ff">connect</text>
 </g>
 <!-- receive -->
 <g id="node9" class="node">
@@ -181,21 +181,21 @@
 <!-- subscribedQ -->
 <g id="node7" class="node">
 <title>subscribedQ</title>
-<polygon fill="none" stroke="#000000" points="305.6775,-624.5124 254.3225,-624.5124 254.3225,-630.5124 236.3225,-612.5124 254.3225,-594.5124 254.3225,-600.5124 305.6775,-600.5124 305.6775,-624.5124"/>
-<text text-anchor="middle" x="271" y="-615.8124" font-family="arial" font-size="11.00" fill="#000000">subscribed</text>
-<text text-anchor="middle" x="271" y="-602.6124" font-family="arial" font-size="11.00" fill="#000000">TBQueue</text>
+<polygon fill="none" stroke="#000000" points="305.6775,-612.5124 254.3225,-612.5124 254.3225,-618.5124 236.3225,-600.5124 254.3225,-582.5124 254.3225,-588.5124 305.6775,-588.5124 305.6775,-612.5124"/>
+<text text-anchor="middle" x="271" y="-603.8124" font-family="arial" font-size="11.00" fill="#000000">subscribed</text>
+<text text-anchor="middle" x="271" y="-590.6124" font-family="arial" font-size="11.00" fill="#000000">TBQueue</text>
 </g>
 <!-- subscribedQ&#45;&gt;server -->
 <g id="edge4" class="edge">
 <title>subscribedQ&#45;&gt;server</title>
-<path fill="none" stroke="#000000" d="M266.2392,-594.3229C259.1914,-569.2843 244.4608,-523.3566 223,-488.6249 209.5338,-466.8315 190.3419,-445.4821 174.1312,-429.2605"/>
-<polygon fill="#000000" stroke="#000000" points="166.9242,-422.1849 177.2126,-425.9794 170.4921,-425.6877 174.0601,-429.1906 174.0601,-429.1906 174.0601,-429.1906 170.4921,-425.6877 170.9075,-432.4017 166.9242,-422.1849 166.9242,-422.1849"/>
+<path fill="none" stroke="#000000" d="M266.5979,-582.0921C259.9663,-556.7857 245.7163,-510.5487 223,-476.6249 210.3763,-457.773 192.3233,-440.0878 176.5604,-426.5205"/>
+<polygon fill="#000000" stroke="#000000" points="168.5671,-419.8168 179.1209,-422.7948 172.3982,-423.0298 176.2292,-426.2428 176.2292,-426.2428 176.2292,-426.2428 172.3982,-423.0298 173.3375,-429.6907 168.5671,-419.8168 168.5671,-419.8168"/>
 </g>
 <!-- cs&#45;&gt;receive -->
 <g id="edge10" class="edge">
 <title>cs&#45;&gt;receive</title>
-<path fill="none" stroke="#0000ff" d="M466.1473,-488.5585C450.8321,-453.3233 416.6919,-374.7781 396.288,-327.8357"/>
-<polygon fill="#0000ff" stroke="#0000ff" points="392.2772,-318.6081 400.3905,-325.9854 394.2703,-323.1937 396.2635,-327.7792 396.2635,-327.7792 396.2635,-327.7792 394.2703,-323.1937 392.1365,-329.5731 392.2772,-318.6081 392.2772,-318.6081"/>
+<path fill="none" stroke="#0000ff" d="M465.6581,-476.498C450.379,-443.2963 417.6111,-372.0915 397.3247,-328.0092"/>
+<polygon fill="#0000ff" stroke="#0000ff" points="393.0726,-318.7693 401.3411,-325.9723 395.1629,-323.3114 397.2532,-327.8535 397.2532,-327.8535 397.2532,-327.8535 395.1629,-323.3114 393.1653,-329.7348 393.0726,-318.7693 393.0726,-318.7693"/>
 </g>
 <!-- receive&#45;&gt;inq -->
 <g id="edge11" class="edge">
@@ -223,10 +223,9 @@
 <!-- client&#45;&gt;subscribedQ -->
 <g id="edge21" class="edge">
 <title>client&#45;&gt;subscribedQ</title>
-<path fill="none" stroke="#000000" d="M548.853,-310.1374C541.8457,-315.5196 534.1842,-321.2865 527,-326.4499 449.2252,-382.3484 398.5216,-365.1821 348.117,-446.6249 342.4564,-455.7712 348.2294,-460.3649 345,-470.6249 331.6605,-513.0048 306.1092,-557.8064 288.8091,-585.4655"/>
-<polygon fill="#000000" stroke="#000000" points="283.2879,-594.1602 284.8498,-583.306 285.9683,-589.9392 288.6486,-585.7183 288.6486,-585.7183 288.6486,-585.7183 285.9683,-589.9392 292.4474,-588.1306 283.2879,-594.1602 283.2879,-594.1602"/>
-<text text-anchor="middle" x="362.4415" y="-461.6249" font-family="arial" font-size="10.00" fill="#000000">(rId,</text>
-<text text-anchor="middle" x="362.4415" y="-449.6249" font-family="arial" font-size="10.00" fill="#000000">Client)</text>
+<path fill="none" stroke="#000000" d="M548.6699,-309.8896C541.6619,-315.2708 534.0458,-321.0992 527,-326.4499 456.1732,-380.2374 427.111,-381.0795 367,-446.6249 330.9316,-485.954 300.5471,-540.6501 284.1272,-573.1325"/>
+<polygon fill="#000000" stroke="#000000" points="279.4889,-582.4585 279.9129,-571.5008 281.7155,-577.9816 283.9421,-573.5048 283.9421,-573.5048 283.9421,-573.5048 281.7155,-577.9816 287.9713,-575.5087 279.4889,-582.4585 279.4889,-582.4585"/>
+<text text-anchor="middle" x="391.7185" y="-449.6249" font-family="arial" font-size="10.00" fill="#000000">(rId, Client)</text>
 </g>
 <!-- client&#45;&gt;subscriber -->
 <g id="edge16" class="edge">
@@ -253,8 +252,8 @@
 <!-- send&#45;&gt;cs -->
 <g id="edge20" class="edge">
 <title>send&#45;&gt;cs</title>
-<path fill="none" stroke="#0000ff" d="M478.347,-318.6081C477.3889,-360.047 475.6125,-436.8811 474.6539,-478.3415"/>
-<polygon fill="#0000ff" stroke="#0000ff" points="474.4177,-488.5585 470.1501,-478.4571 474.5333,-483.5598 474.6489,-478.5611 474.6489,-478.5611 474.6489,-478.5611 474.5333,-483.5598 479.1477,-478.6652 474.4177,-488.5585 474.4177,-488.5585"/>
+<path fill="none" stroke="#0000ff" d="M478.3046,-318.7693C477.35,-357.7707 475.6436,-427.4808 474.6911,-466.3911"/>
+<polygon fill="#0000ff" stroke="#0000ff" points="474.4437,-476.498 470.1899,-466.3908 474.5661,-471.4995 474.6885,-466.501 474.6885,-466.501 474.6885,-466.501 474.5661,-471.4995 479.1872,-466.6111 474.4437,-476.498 474.4437,-476.498"/>
 </g>
 <!-- inq&#45;&gt;client -->
 <g id="edge12" class="edge">