Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
5b6eb4e7
Commit
5b6eb4e7
authored
Aug 12, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish the state machine some more
parent
0c189d8c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
16 deletions
+16
-16
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+16
-16
No files found.
bin/varnishd/cache/cache_req_fsm.c
View file @
5b6eb4e7
...
...
@@ -393,13 +393,19 @@ cnt_fetch(struct worker *wrk, struct req *req)
DOT subgraph xcluster_lookup {
DOT lookup [
DOT shape=record
DOT label="{<top>cnt_lookup:|hash lookup|{<busy>busy?|exp|expbusy|hit|miss}|{vcl_lookup\{\}|{xx|xx}}|{<no>no|obj.f.pass?|<yes>yes}}"
DOT label="{<top>cnt_lookup:|hash lookup|{<busy>busy?|<e>exp?|<eb>expbusy?|<h>hit?|<miss>miss?|<hfp>hit-for-pass?}}"
DOT ]
DOT lookup2 [
DOT shape=record
DOT label="{<top>cnt_lookup:|{vcl_lookup\{\}|{xx|xx}}}"
DOT ]
DOT }
DOT lookup:busy:w -> lookup:top:w [label="(waitinglist)"]
DOT lookup:miss -> miss [style=bold,color=blue]
DOT lookup:no -> hit [style=bold,color=green]
DOT lookup:yes -> pass [style=bold,color=red]
DOT lookup:miss:s -> miss [style=bold,color=blue]
DOT lookup:hfp:s -> pass [style=bold,color=red]
DOT lookup:e:s -> lookup2 [style=bold,color=green]
DOT lookup:eb:s -> lookup2 [style=bold,color=green]
DOT lookup:h:s -> lookup2 [style=bold,color=green]
*/
static
enum
req_fsm_nxt
...
...
@@ -446,8 +452,10 @@ cnt_lookup(struct worker *wrk, struct req *req)
return
(
REQ_FSM_MORE
);
}
AN
(
oc
);
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
AZ
(
oc
->
flags
&
OC_F_BUSY
);
AZ
(
req
->
objcore
);
AZ
(
req
->
busyobj
);
if
(
oc
->
flags
&
OC_F_PASS
)
{
/* Found a hit-for-pass */
...
...
@@ -494,8 +502,6 @@ cnt_lookup(struct worker *wrk, struct req *req)
INCOMPL
();
}
CHECK_OBJ_NOTNULL
(
oc
,
OBJCORE_MAGIC
);
oh
=
oc
->
objhead
;
CHECK_OBJ_NOTNULL
(
oh
,
OBJHEAD_MAGIC
);
...
...
@@ -508,15 +514,9 @@ cnt_lookup(struct worker *wrk, struct req *req)
VRY_Finish
(
req
,
NULL
);
if
(
oc
->
flags
&
OC_F_PASS
)
wrk
->
stats
.
cache_hitpass
++
;
else
wrk
->
stats
.
cache_hit
++
;
wrk
->
stats
.
cache_hit
++
;
VSLb
(
req
->
vsl
,
SLT_Hit
,
"%u"
,
req
->
obj
->
vxid
);
AZ
(
req
->
objcore
);
AZ
(
req
->
busyobj
);
VCL_lookup_method
(
req
->
vcl
,
wrk
,
req
,
NULL
,
req
->
http
->
ws
);
if
(
wrk
->
handling
==
VCL_RET_DELIVER
)
{
...
...
@@ -553,7 +553,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
DOT subgraph xcluster_miss {
DOT miss [
DOT shape=record
DOT label="{cnt_miss:|{vcl_miss\{\}|req.*}|{<err>error?|<rst>restart?}|{<
pass>pass?|<fetch>fetch
?}}"
DOT label="{cnt_miss:|{vcl_miss\{\}|req.*}|{<err>error?|<rst>restart?}|{<
fetch>fetch?|<pass>pass
?}}"
DOT ]
DOT }
DOT miss:fetch -> fetch [label="fetch",style=bold,color=blue]
...
...
@@ -761,7 +761,7 @@ cnt_restart(const struct worker *wrk, struct req *req)
DOT subgraph xcluster_recv {
DOT recv [
DOT shape=record
DOT label="{cnt_recv:|{vcl_recv\{\}|req.*}|{vcl_hash\{\}|req.*}|{<
pass>pass?|<lookup>lookup
?|<pipe>pipe?|<error>error?|<purge>purge?}}"
DOT label="{cnt_recv:|{vcl_recv\{\}|req.*}|{vcl_hash\{\}|req.*}|{<
lookup>lookup?|<pass>pass
?|<pipe>pipe?|<error>error?|<purge>purge?}}"
DOT ]
DOT }
DOT recv:pipe -> pipe [style=bold,color=orange]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment