Commit 7491696a authored by Nils Goroll's avatar Nils Goroll

add fail to dot graphs, improve vcl(label) a bit

parent 0b0a8e8b
...@@ -39,7 +39,7 @@ digraph cache_fetch { ...@@ -39,7 +39,7 @@ digraph cache_fetch {
/* vbf_stp_startfetch() */ /* vbf_stp_startfetch() */
v_b_f [ v_b_f [
shape=record shape=record
label="{vbf_stp_startfetch:|{vcl_backend_fetch\{\}|bereq.*}|{abandon|<fetch>fetch}}" label="{vbf_stp_startfetch:|{vcl_backend_fetch\{\}|bereq.*}|{fail|abandon|<fetch>fetch}}"
] ]
v_b_f:fetch:s -> v_b_hdrs [style=bold] v_b_f:fetch:s -> v_b_hdrs [style=bold]
v_b_hdrs [ label="send bereq,\nread beresp (headers)"] v_b_hdrs [ label="send bereq,\nread beresp (headers)"]
...@@ -47,7 +47,7 @@ digraph cache_fetch { ...@@ -47,7 +47,7 @@ digraph cache_fetch {
v_b_hdrs -> v_b_e v_b_hdrs -> v_b_e
v_b_r [ v_b_r [
shape=record shape=record
label="{vbf_stp_startfetch:|{vcl_backend_response\{\}|{bereq.*|beresp.*}}|{{retry|{<max>max?|<retry>ok?}}|abandon|{deliver or pass|{<fetch_304>304?|<non_304>other?}}}}" label="{vbf_stp_startfetch:|{vcl_backend_response\{\}|{bereq.*|beresp.*}}|{fail|{retry|{<max>max?|<retry>ok?}}|abandon|{deliver or pass|{<fetch_304>304?|<non_304>other?}}}}"
] ]
v_b_r:retry -> v_b_r_retry [color=purple] v_b_r:retry -> v_b_r_retry [color=purple]
v_b_r:max -> v_b_e v_b_r:max -> v_b_e
...@@ -96,7 +96,7 @@ digraph cache_fetch { ...@@ -96,7 +96,7 @@ digraph cache_fetch {
/* vbf_stp_error */ /* vbf_stp_error */
v_b_e [ v_b_e [
shape=record shape=record
label="{vbf_stp_error:|{vcl_backend_error\{\}|{bereq.*|beresp.*}}|{{retry|{<max>max?|<retry>ok?}}|abandon|<deliver>deliver}}}" label="{vbf_stp_error:|{vcl_backend_error\{\}|{bereq.*|beresp.*}}|{{retry|{<fail>fail|<max>max?|<retry>ok?}}|abandon|<deliver>deliver}}}"
] ]
// v_b_e:deliver aka "backend synth" - goes into cache // v_b_e:deliver aka "backend synth" - goes into cache
v_b_e:deliver -> FETCH_DONE [label="\"backend synth\""] v_b_e:deliver -> FETCH_DONE [label="\"backend synth\""]
......
This diff is collapsed.
...@@ -48,13 +48,13 @@ digraph cache_req_fsm { ...@@ -48,13 +48,13 @@ digraph cache_req_fsm {
*/ */
acceptor [shape=hexagon label="Request received"] acceptor [shape=hexagon label="Request received"]
label_select [shape=hexagon label="Label selected"] label_select [shape=hexagon label="LABEL"]
ESI_REQ [shape=hexagon label="ESI request"] ESI_REQ [shape=hexagon label="ESI request"]
RESTART [shape=plaintext] RESTART [shape=plaintext]
ESI_REQ -> recv ESI_REQ -> recv
SYNTH [shape=plaintext] SYNTH [shape=plaintext]
LABEL [shape=plaintext] FAIL [shape=plaintext]
acceptor -> recv [style=bold] acceptor -> recv [style=bold]
label_select -> recv [style=bold] label_select -> recv [style=bold]
...@@ -62,7 +62,7 @@ digraph cache_req_fsm { ...@@ -62,7 +62,7 @@ digraph cache_req_fsm {
/* cnt_deliver() */ /* cnt_deliver() */
deliver [ deliver [
shape=record shape=record
label="{cnt_deliver:|Filter obj.-\>resp.|{vcl_deliver\{\}|{req.*|resp.*}}|{<restart>restart|<deliver>deliver|<synth>synth}}" label="{cnt_deliver:|Filter obj.-\>resp.|{vcl_deliver\{\}|{req.*|resp.*}}|{fail|<restart>restart|<deliver>deliver|<synth>synth}}"
] ]
deliver:deliver:s -> V1D_Deliver [style=bold,color=green] deliver:deliver:s -> V1D_Deliver [style=bold,color=green]
...@@ -79,9 +79,10 @@ digraph cache_req_fsm { ...@@ -79,9 +79,10 @@ digraph cache_req_fsm {
subgraph xcluster_synth { subgraph xcluster_synth {
synth [ synth [
shape=record shape=record
label="{cnt_synth:|{vcl_synth\{\}|{req.*|resp.*}}|{<del>deliver|<restart>restart}}" label="{cnt_synth:|{vcl_synth\{\}|{req.*|resp.*}}|{fail|<del>deliver|<restart>restart}}"
] ]
FAIL -> synth [color=purple]
SYNTH -> synth [color=purple] SYNTH -> synth [color=purple]
synth:del:s -> V1D_Deliver [color=purple] synth:del:s -> V1D_Deliver [color=purple]
} }
...@@ -120,7 +121,7 @@ digraph cache_req_fsm { ...@@ -120,7 +121,7 @@ digraph cache_req_fsm {
] ]
lookup2 [ lookup2 [
shape=record shape=record
label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{<deliver>deliver|<miss>miss|restart|synth|<pass>pass}}" label="{<top>cnt_lookup:|{vcl_hit\{\}|{req.*|obj.*}}|{fail|<deliver>deliver|<miss>miss|restart|synth|<pass>pass}}"
] ]
} }
lookup:busy:e -> lookup:top:e [label="(waitinglist)", lookup:busy:e -> lookup:top:e [label="(waitinglist)",
...@@ -140,7 +141,7 @@ digraph cache_req_fsm { ...@@ -140,7 +141,7 @@ digraph cache_req_fsm {
subgraph xcluster_miss { subgraph xcluster_miss {
miss [ miss [
shape=record shape=record
label="{cnt_miss:|{vcl_miss\{\}|req.*}|{<fetch>fetch|<synth>synth|<rst>restart|<pass>pass}}" label="{cnt_miss:|{vcl_miss\{\}|req.*}|{fail|<fetch>fetch|<synth>synth|<rst>restart|<pass>pass}}"
] ]
} }
miss:fetch:s -> FETCH [style=bold,color=blue] miss:fetch:s -> FETCH [style=bold,color=blue]
...@@ -150,7 +151,7 @@ digraph cache_req_fsm { ...@@ -150,7 +151,7 @@ digraph cache_req_fsm {
subgraph xcluster_pass { subgraph xcluster_pass {
pass [ pass [
shape=record shape=record
label="{cnt_pass:|{vcl_pass\{\}|req.*}|{<fetch>fetch|<synth>synth|<rst>restart}}" label="{cnt_pass:|{vcl_pass\{\}|req.*}|{fail|<fetch>fetch|<synth>synth|<rst>restart}}"
] ]
} }
pass:fetch:s -> FETCH [style=bold, color=red] pass:fetch:s -> FETCH [style=bold, color=red]
...@@ -159,7 +160,7 @@ digraph cache_req_fsm { ...@@ -159,7 +160,7 @@ digraph cache_req_fsm {
subgraph xcluster_pipe { subgraph xcluster_pipe {
pipe [ pipe [
shape=record shape=record
label="{cnt_pipe:|filter req.*-\>bereq.*|{vcl_pipe\{\}|{req.*|bereq.*}}|{<pipe>pipe|<synth>synth}}" label="{cnt_pipe:|filter req.*-\>bereq.*|{vcl_pipe\{\}|{req.*|bereq.*}}|{fail|<pipe>pipe|<synth>synth}}"
] ]
pipe_do [ pipe_do [
shape=ellipse shape=ellipse
...@@ -175,7 +176,7 @@ digraph cache_req_fsm { ...@@ -175,7 +176,7 @@ digraph cache_req_fsm {
shape=record shape=record
color=grey color=grey
fontcolor=grey fontcolor=grey
label="{cnt_restart:|{<ok>ok?|<max>max_restarts?}}" label="{cnt_restart:|{fail|<ok>ok?|<max>max_restarts?}}"
] ]
} }
RESTART -> restart [color=purple] RESTART -> restart [color=purple]
...@@ -187,7 +188,7 @@ digraph cache_req_fsm { ...@@ -187,7 +188,7 @@ digraph cache_req_fsm {
subgraph xcluster_recv { subgraph xcluster_recv {
recv [ recv [
shape=record shape=record
label="{cnt_recv:|{vcl_recv\{\}|req.*}|{<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|<synth>synth|<vcl>vcl}}"
] ]
recv:hash -> hash [style=bold,color=green] recv:hash -> hash [style=bold,color=green]
hash [ hash [
...@@ -205,13 +206,13 @@ digraph cache_req_fsm { ...@@ -205,13 +206,13 @@ digraph cache_req_fsm {
recv:purge:s -> hash [style=bold,color=purple] recv:purge:s -> hash [style=bold,color=purple]
recv:vcl:s -> vcl_label recv:vcl:s -> vcl_label
vcl_label [label="LABEL",shape=plaintext] vcl_label [label="switch to vcl\nLABEL",shape=plaintext]
/* cnt_purge */ /* cnt_purge */
subgraph xcluster_purge { subgraph xcluster_purge {
purge [ purge [
shape=record shape=record
label="{<top>cnt_purge:|{vcl_purge\{\}|req.*}|{<synth>synth|<restart>restart}}" label="{<top>cnt_purge:|{vcl_purge\{\}|req.*}|{fail|<synth>synth|<restart>restart}}"
] ]
} }
} }
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment