[master] b1b4dac graphviz/svg/rst: add return(restart) from vcl_recv
Nils Goroll
nils.goroll at uplex.de
Fri Dec 29 18:22:07 UTC 2017
commit b1b4dac051c720559e39106e27bce8e2a901a0c1
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Fri Dec 29 19:18:33 2017 +0100
graphviz/svg/rst: add return(restart) from vcl_recv
Ref: c15eefb1b237f13564a3453618ede6265396347b
diff --git a/doc/graphviz/cache_req_fsm.dot b/doc/graphviz/cache_req_fsm.dot
index bbec3e5..3501b7b 100644
--- a/doc/graphviz/cache_req_fsm.dot
+++ b/doc/graphviz/cache_req_fsm.dot
@@ -188,7 +188,7 @@ digraph cache_req_fsm {
subgraph xcluster_recv {
recv [
shape=record
- label="{cnt_recv:|{vcl_recv\{\}|req.*}|{fail|<hash>hash|<purge>purge|<pass>pass|<pipe>pipe|<synth>synth|<vcl>vcl}}"
+ label="{cnt_recv:|{vcl_recv\{\}|req.*}|{fail|<hash>hash|<purge>purge|<pass>pass|<pipe>pipe|<restart>restart|<synth>synth|<vcl>vcl}}"
]
recv:hash -> hash [style=bold,color=green]
hash [
diff --git a/doc/graphviz/cache_req_fsm.svg b/doc/graphviz/cache_req_fsm.svg
index 4afe57d..60c71ac 100644
--- a/doc/graphviz/cache_req_fsm.svg
+++ b/doc/graphviz/cache_req_fsm.svg
@@ -4,28 +4,28 @@
<!-- Generated by graphviz version 2.38.0 (20140413.2041)
-->
<!-- Title: cache_req_fsm Pages: 1 -->
-<svg width="854pt" height="1349pt"
- viewBox="18.00 18.00 835.50 1331.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="891pt" height="1349pt"
+ viewBox="18.00 18.00 872.50 1331.00" 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(22 1327)">
<title>cache_req_fsm</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-1309 813.5,-1309 813.5,4 -4,4"/>
+<polygon fill="white" stroke="none" points="-4,4 -4,-1309 850.5,-1309 850.5,4 -4,4"/>
<g id="clust3" class="cluster"><title>cluster_backend</title>
<polygon fill="aliceblue" stroke="aliceblue" points="72,-299 72,-408 377,-408 377,-299 72,-299"/>
</g>
<!-- acceptor -->
<g id="node1" class="node"><title>acceptor</title>
-<polygon fill="none" stroke="black" points="509.611,-1208.5 467.305,-1226.5 382.695,-1226.5 340.389,-1208.5 382.695,-1190.5 467.305,-1190.5 509.611,-1208.5"/>
-<text text-anchor="middle" x="425" y="-1204.8" font-family="Times,serif" font-size="14.00">Request received</text>
+<polygon fill="none" stroke="black" points="546.611,-1208.5 504.305,-1226.5 419.695,-1226.5 377.389,-1208.5 419.695,-1190.5 504.305,-1190.5 546.611,-1208.5"/>
+<text text-anchor="middle" x="462" y="-1204.8" font-family="Times,serif" font-size="14.00">Request received</text>
</g>
<!-- recv -->
<g id="node5" class="node"><title>recv</title>
-<polygon fill="none" stroke="black" points="349,-1078.5 349,-1147.5 641,-1147.5 641,-1078.5 349,-1078.5"/>
-<text text-anchor="middle" x="495" y="-1132.3" font-family="Times,serif" font-size="14.00">cnt_recv:</text>
-<polyline fill="none" stroke="black" points="349,-1124.5 641,-1124.5 "/>
-<text text-anchor="middle" x="430" y="-1109.3" font-family="Times,serif" font-size="14.00">vcl_recv{}</text>
-<polyline fill="none" stroke="black" points="511,-1101.5 511,-1124.5 "/>
-<text text-anchor="middle" x="576" y="-1109.3" font-family="Times,serif" font-size="14.00">req.*</text>
-<polyline fill="none" stroke="black" points="349,-1101.5 641,-1101.5 "/>
+<polygon fill="none" stroke="black" points="349,-1078.5 349,-1147.5 691,-1147.5 691,-1078.5 349,-1078.5"/>
+<text text-anchor="middle" x="520" y="-1132.3" font-family="Times,serif" font-size="14.00">cnt_recv:</text>
+<polyline fill="none" stroke="black" points="349,-1124.5 691,-1124.5 "/>
+<text text-anchor="middle" x="442.5" y="-1109.3" font-family="Times,serif" font-size="14.00">vcl_recv{}</text>
+<polyline fill="none" stroke="black" points="536,-1101.5 536,-1124.5 "/>
+<text text-anchor="middle" x="613.5" y="-1109.3" font-family="Times,serif" font-size="14.00">req.*</text>
+<polyline fill="none" stroke="black" points="349,-1101.5 691,-1101.5 "/>
<text text-anchor="middle" x="366.5" y="-1086.3" font-family="Times,serif" font-size="14.00">fail</text>
<polyline fill="none" stroke="black" points="384,-1078.5 384,-1101.5 "/>
<text text-anchor="middle" x="405.5" y="-1086.3" font-family="Times,serif" font-size="14.00">hash</text>
@@ -36,54 +36,56 @@
<polyline fill="none" stroke="black" points="518,-1078.5 518,-1101.5 "/>
<text text-anchor="middle" x="538.5" y="-1086.3" font-family="Times,serif" font-size="14.00">pipe</text>
<polyline fill="none" stroke="black" points="559,-1078.5 559,-1101.5 "/>
-<text text-anchor="middle" x="583" y="-1086.3" font-family="Times,serif" font-size="14.00">synth</text>
-<polyline fill="none" stroke="black" points="607,-1078.5 607,-1101.5 "/>
-<text text-anchor="middle" x="624" y="-1086.3" font-family="Times,serif" font-size="14.00">vcl</text>
+<text text-anchor="middle" x="584" y="-1086.3" font-family="Times,serif" font-size="14.00">restart</text>
+<polyline fill="none" stroke="black" points="609,-1078.5 609,-1101.5 "/>
+<text text-anchor="middle" x="633" y="-1086.3" font-family="Times,serif" font-size="14.00">synth</text>
+<polyline fill="none" stroke="black" points="657,-1078.5 657,-1101.5 "/>
+<text text-anchor="middle" x="674" y="-1086.3" font-family="Times,serif" font-size="14.00">vcl</text>
</g>
<!-- acceptor->recv -->
<g id="edge2" class="edge"><title>acceptor->recv</title>
-<path fill="none" stroke="black" stroke-width="2" d="M437.839,-1190.35C445.087,-1180.67 454.488,-1168.11 463.566,-1155.99"/>
-<polygon fill="black" stroke="black" stroke-width="2" points="466.577,-1157.8 469.769,-1147.7 460.974,-1153.61 466.577,-1157.8"/>
+<path fill="none" stroke="black" stroke-width="2" d="M472.638,-1190.35C478.586,-1180.76 486.283,-1168.35 493.738,-1156.34"/>
+<polygon fill="black" stroke="black" stroke-width="2" points="496.797,-1158.04 499.094,-1147.7 490.848,-1154.35 496.797,-1158.04"/>
</g>
<!-- label_select -->
<g id="node2" class="node"><title>label_select</title>
-<polygon fill="none" stroke="black" points="624.063,-1208.5 600.031,-1226.5 551.969,-1226.5 527.937,-1208.5 551.969,-1190.5 600.031,-1190.5 624.063,-1208.5"/>
-<text text-anchor="middle" x="576" y="-1204.8" font-family="Times,serif" font-size="14.00">LABEL</text>
+<polygon fill="none" stroke="black" points="661.063,-1208.5 637.031,-1226.5 588.969,-1226.5 564.937,-1208.5 588.969,-1190.5 637.031,-1190.5 661.063,-1208.5"/>
+<text text-anchor="middle" x="613" y="-1204.8" font-family="Times,serif" font-size="14.00">LABEL</text>
</g>
<!-- label_select->recv -->
<g id="edge3" class="edge"><title>label_select->recv</title>
-<path fill="none" stroke="black" stroke-width="2" d="M561.143,-1190.35C552.596,-1180.48 541.459,-1167.63 530.768,-1155.29"/>
-<polygon fill="black" stroke="black" stroke-width="2" points="533.39,-1152.97 524.196,-1147.7 528.099,-1157.55 533.39,-1152.97"/>
+<path fill="none" stroke="black" stroke-width="2" d="M595.942,-1190.35C586.036,-1180.39 573.1,-1167.39 560.72,-1154.94"/>
+<polygon fill="black" stroke="black" stroke-width="2" points="563.055,-1152.32 553.522,-1147.7 558.092,-1157.26 563.055,-1152.32"/>
</g>
<!-- ESI_REQ -->
<g id="node3" class="node"><title>ESI_REQ</title>
-<polygon fill="none" stroke="black" points="322.082,-1208.5 291.041,-1226.5 228.959,-1226.5 197.918,-1208.5 228.959,-1190.5 291.041,-1190.5 322.082,-1208.5"/>
-<text text-anchor="middle" x="260" y="-1204.8" font-family="Times,serif" font-size="14.00">ESI request</text>
+<polygon fill="none" stroke="black" points="359.082,-1208.5 328.041,-1226.5 265.959,-1226.5 234.918,-1208.5 265.959,-1190.5 328.041,-1190.5 359.082,-1208.5"/>
+<text text-anchor="middle" x="297" y="-1204.8" font-family="Times,serif" font-size="14.00">ESI request</text>
</g>
<!-- ESI_REQ->recv -->
<g id="edge1" class="edge"><title>ESI_REQ->recv</title>
-<path fill="none" stroke="black" d="M295.947,-1193.2C324.039,-1182.02 364.402,-1165.96 401.449,-1151.22"/>
-<polygon fill="black" stroke="black" points="402.789,-1154.46 410.786,-1147.51 400.201,-1147.95 402.789,-1154.46"/>
+<path fill="none" stroke="black" d="M332.335,-1192.68C358.716,-1181.62 395.993,-1165.99 430.379,-1151.58"/>
+<polygon fill="black" stroke="black" points="432.121,-1154.64 439.99,-1147.55 429.415,-1148.19 432.121,-1154.64"/>
</g>
<!-- RESTART -->
<g id="node4" class="node"><title>RESTART</title>
-<text text-anchor="middle" x="726" y="-1283.3" font-family="Times,serif" font-size="14.00">RESTART</text>
+<text text-anchor="middle" x="763" y="-1283.3" font-family="Times,serif" font-size="14.00">RESTART</text>
</g>
<!-- restart -->
<g id="node24" class="node"><title>restart</title>
-<polygon fill="none" stroke="grey" points="642.5,-1185.5 642.5,-1231.5 809.5,-1231.5 809.5,-1185.5 642.5,-1185.5"/>
-<text text-anchor="middle" x="726" y="-1216.3" font-family="Times,serif" font-size="14.00" fill="grey">cnt_restart:</text>
-<polyline fill="none" stroke="grey" points="642.5,-1208.5 809.5,-1208.5 "/>
-<text text-anchor="middle" x="660" y="-1193.3" font-family="Times,serif" font-size="14.00" fill="grey">fail</text>
-<polyline fill="none" stroke="grey" points="677.5,-1185.5 677.5,-1208.5 "/>
-<text text-anchor="middle" x="696.5" y="-1193.3" font-family="Times,serif" font-size="14.00" fill="grey">ok?</text>
-<polyline fill="none" stroke="grey" points="715.5,-1185.5 715.5,-1208.5 "/>
-<text text-anchor="middle" x="762.5" y="-1193.3" font-family="Times,serif" font-size="14.00" fill="grey">max_restarts?</text>
+<polygon fill="none" stroke="grey" points="679.5,-1185.5 679.5,-1231.5 846.5,-1231.5 846.5,-1185.5 679.5,-1185.5"/>
+<text text-anchor="middle" x="763" y="-1216.3" font-family="Times,serif" font-size="14.00" fill="grey">cnt_restart:</text>
+<polyline fill="none" stroke="grey" points="679.5,-1208.5 846.5,-1208.5 "/>
+<text text-anchor="middle" x="697" y="-1193.3" font-family="Times,serif" font-size="14.00" fill="grey">fail</text>
+<polyline fill="none" stroke="grey" points="714.5,-1185.5 714.5,-1208.5 "/>
+<text text-anchor="middle" x="733.5" y="-1193.3" font-family="Times,serif" font-size="14.00" fill="grey">ok?</text>
+<polyline fill="none" stroke="grey" points="752.5,-1185.5 752.5,-1208.5 "/>
+<text text-anchor="middle" x="799.5" y="-1193.3" font-family="Times,serif" font-size="14.00" fill="grey">max_restarts?</text>
</g>
<!-- RESTART->restart -->
<g id="edge30" class="edge"><title>RESTART->restart</title>
-<path fill="none" stroke="purple" d="M726,-1268.64C726,-1260.7 726,-1251.02 726,-1241.81"/>
-<polygon fill="purple" stroke="purple" points="729.5,-1241.74 726,-1231.74 722.5,-1241.74 729.5,-1241.74"/>
+<path fill="none" stroke="purple" d="M763,-1268.64C763,-1260.7 763,-1251.02 763,-1241.81"/>
+<polygon fill="purple" stroke="purple" points="766.5,-1241.74 763,-1231.74 759.5,-1241.74 766.5,-1241.74"/>
</g>
<!-- hash -->
<g id="node26" class="node"><title>hash</title>
@@ -108,8 +110,8 @@
</g>
<!-- recv->hash -->
<g id="edge35" class="edge"><title>recv:pass->hash</title>
-<path fill="none" stroke="red" stroke-width="2" d="M498,-1078C498,-1068.77 496.219,-1059.18 493.649,-1050.14"/>
-<polygon fill="red" stroke="red" stroke-width="2" points="496.976,-1049.06 490.596,-1040.6 490.309,-1051.19 496.976,-1049.06"/>
+<path fill="none" stroke="red" stroke-width="2" d="M497,-1078C497,-1068.91 495.333,-1059.44 492.916,-1050.49"/>
+<polygon fill="red" stroke="red" stroke-width="2" points="496.182,-1049.2 489.918,-1040.66 489.487,-1051.24 496.182,-1049.2"/>
</g>
<!-- recv->hash -->
<g id="edge40" class="edge"><title>recv:purge:s->hash</title>
@@ -118,13 +120,13 @@
</g>
<!-- vcl_label -->
<g id="node28" class="node"><title>vcl_label</title>
-<text text-anchor="middle" x="624" y="-1009.8" font-family="Times,serif" font-size="14.00">switch to vcl</text>
-<text text-anchor="middle" x="624" y="-994.8" font-family="Times,serif" font-size="14.00">LABEL</text>
+<text text-anchor="middle" x="674" y="-1009.8" font-family="Times,serif" font-size="14.00">switch to vcl</text>
+<text text-anchor="middle" x="674" y="-994.8" font-family="Times,serif" font-size="14.00">LABEL</text>
</g>
<!-- recv->vcl_label -->
<g id="edge41" class="edge"><title>recv:vcl:s->vcl_label</title>
-<path fill="none" stroke="black" d="M624,-1078C624,-1063.94 624,-1048.31 624,-1035.31"/>
-<polygon fill="black" stroke="black" points="627.5,-1035.09 624,-1025.09 620.5,-1035.09 627.5,-1035.09"/>
+<path fill="none" stroke="black" d="M674,-1078C674,-1063.94 674,-1048.31 674,-1035.31"/>
+<polygon fill="black" stroke="black" points="677.5,-1035.09 674,-1025.09 670.5,-1035.09 677.5,-1035.09"/>
</g>
<!-- SYNTH -->
<g id="node6" class="node"><title>SYNTH</title>
@@ -446,17 +448,17 @@
</g>
<!-- restart->recv -->
<g id="edge31" class="edge"><title>restart:ok:s->recv</title>
-<path fill="none" stroke="black" d="M696,-1185C696,-1170.43 676.995,-1158.11 650.672,-1148.03"/>
-<polygon fill="black" stroke="black" points="651.67,-1144.67 641.076,-1144.56 649.289,-1151.25 651.67,-1144.67"/>
+<path fill="none" stroke="black" d="M733,-1185C733,-1171.81 718.114,-1160.63 696.213,-1151.32"/>
+<polygon fill="black" stroke="black" points="697.368,-1148.02 686.782,-1147.58 694.787,-1154.52 697.368,-1148.02"/>
</g>
<!-- err_restart -->
<g id="node25" class="node"><title>err_restart</title>
-<text text-anchor="middle" x="763" y="-1109.3" font-family="Times,serif" font-size="14.00">SYNTH</text>
+<text text-anchor="middle" x="800" y="-1109.3" font-family="Times,serif" font-size="14.00">SYNTH</text>
</g>
<!-- restart->err_restart -->
<g id="edge32" class="edge"><title>restart:max:s->err_restart</title>
-<path fill="none" stroke="purple" d="M763,-1185C763,-1170.65 763,-1154.67 763,-1141.51"/>
-<polygon fill="purple" stroke="purple" points="766.5,-1141.22 763,-1131.22 759.5,-1141.22 766.5,-1141.22"/>
+<path fill="none" stroke="purple" d="M800,-1185C800,-1170.65 800,-1154.67 800,-1141.51"/>
+<polygon fill="purple" stroke="purple" points="803.5,-1141.22 800,-1131.22 796.5,-1141.22 803.5,-1141.22"/>
</g>
<!-- hash->lookup -->
<g id="edge36" class="edge"><title>hash:lookup:w->lookup</title>
@@ -470,8 +472,8 @@
</g>
<!-- hash->pipe -->
<g id="edge39" class="edge"><title>hash:lookup:e->pipe</title>
-<path fill="none" stroke="orange" stroke-width="2" d="M540,-983C551.094,-983 617.653,-939.977 627,-934 627.187,-933.88 627.374,-933.761 627.561,-933.64"/>
-<polygon fill="orange" stroke="orange" stroke-width="2" points="629.618,-936.477 636.072,-928.075 625.787,-930.619 629.618,-936.477"/>
+<path fill="none" stroke="orange" stroke-width="2" d="M540,-983C578.132,-983 614.541,-962.886 643.494,-940.182"/>
+<polygon fill="orange" stroke="orange" stroke-width="2" points="645.895,-942.741 651.458,-933.724 641.486,-937.304 645.895,-942.741"/>
</g>
<!-- purge -->
<g id="node27" class="node"><title>purge</title>
diff --git a/doc/sphinx/users-guide/vcl-built-in-subs.rst b/doc/sphinx/users-guide/vcl-built-in-subs.rst
index 68c28ae..47b183f 100644
--- a/doc/sphinx/users-guide/vcl-built-in-subs.rst
+++ b/doc/sphinx/users-guide/vcl-built-in-subs.rst
@@ -89,6 +89,9 @@ of the following keywords:
``synth(status code, reason)``
see `synth`_
+ ``restart``
+ see `restart`_
+
``pass``
see `pass`_
More information about the varnish-commit
mailing list