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
88db6f66
Commit
88db6f66
authored
May 17, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move vcl_miss{} before vcl_backend_fetch{}
parent
ac8de26b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
48 additions
and
123 deletions
+48
-123
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+47
-37
c00012.vtc
bin/varnishtest/tests/c00012.vtc
+1
-1
c00033.vtc
bin/varnishtest/tests/c00033.vtc
+0
-85
No files found.
bin/varnishd/cache/cache_req_fsm.c
View file @
88db6f66
...
...
@@ -357,6 +357,8 @@ cnt_fetch(struct worker *wrk, struct req *req)
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
->
vcl
,
VCL_CONF_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
->
objcore
,
OBJCORE_MAGIC
);
bo
=
req
->
busyobj
;
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
...
...
@@ -674,6 +676,7 @@ static enum req_fsm_nxt
cnt_miss
(
struct
worker
*
wrk
,
struct
req
*
req
)
{
struct
busyobj
*
bo
;
int
pass
=
0
;
CHECK_OBJ_NOTNULL
(
wrk
,
WORKER_MAGIC
);
CHECK_OBJ_NOTNULL
(
req
,
REQ_MAGIC
);
...
...
@@ -682,14 +685,41 @@ cnt_miss(struct worker *wrk, struct req *req)
AZ
(
req
->
obj
);
AZ
(
req
->
busyobj
);
/* We optimistically expect to need this most of the time */
bo
=
VBO_GetBusyObj
(
wrk
,
req
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
req
->
busyobj
=
bo
;
VRY_Finish
(
req
,
bo
);
VCL_miss_method
(
req
->
vcl
,
wrk
,
req
,
NULL
,
req
->
http
->
ws
);
switch
(
wrk
->
handling
)
{
case
VCL_RET_ERROR
:
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
AZ
(
HSH_Deref
(
&
wrk
->
stats
,
req
->
objcore
,
NULL
));
req
->
objcore
=
NULL
;
req
->
req_step
=
R_STP_ERROR
;
return
(
REQ_FSM_MORE
);
case
VCL_RET_RESTART
:
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
AZ
(
HSH_Deref
(
&
wrk
->
stats
,
req
->
objcore
,
NULL
));
req
->
objcore
=
NULL
;
req
->
req_step
=
R_STP_RESTART
;
return
(
REQ_FSM_MORE
);
case
VCL_RET_PASS
:
AZ
(
HSH_Deref
(
&
wrk
->
stats
,
req
->
objcore
,
NULL
));
req
->
objcore
=
HSH_NewObjCore
(
wrk
);
pass
=
1
;
break
;
case
VCL_RET_FETCH
:
break
;
default:
WRONG
(
"wrong return from vcl_miss{}"
);
}
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
/* One ref for req, one for FetchBody */
bo
->
refcount
=
2
;
VRY_Finish
(
req
,
bo
);
AN
(
req
->
objcore
);
req
->
objcore
->
busyobj
=
bo
;
wrk
->
stats
.
cache_miss
++
;
...
...
@@ -697,6 +727,7 @@ cnt_miss(struct worker *wrk, struct req *req)
http_FilterReq
(
bo
->
bereq
,
req
->
http
,
HTTPH_R_FETCH
);
http_PrintfHeader
(
bo
->
bereq
,
"X-Varnish: %u"
,
req
->
vsl
->
wid
&
VSL_IDENTMASK
);
if
(
!
pass
)
{
http_ForceGet
(
bo
->
bereq
);
if
(
cache_param
->
http_gzip_support
)
{
/*
...
...
@@ -707,35 +738,14 @@ cnt_miss(struct worker *wrk, struct req *req)
http_Unset
(
bo
->
bereq
,
H_Accept_Encoding
);
http_SetHeader
(
bo
->
bereq
,
"Accept-Encoding: gzip"
);
}
}
VCL_backend_fetch_method
(
bo
->
vcl
,
wrk
,
NULL
,
bo
,
bo
->
bereq
->
ws
);
VCL_miss_method
(
req
->
vcl
,
wrk
,
req
,
NULL
,
req
->
http
->
ws
);
if
(
wrk
->
handling
==
VCL_RET_FETCH
)
{
xxxassert
(
wrk
->
handling
==
VCL_RET_FETCH
);
CHECK_OBJ_NOTNULL
(
bo
,
BUSYOBJ_MAGIC
);
req
->
req_step
=
R_STP_FETCH
;
return
(
REQ_FSM_MORE
);
}
AZ
(
HSH_Deref
(
&
wrk
->
stats
,
req
->
objcore
,
NULL
));
req
->
objcore
=
NULL
;
http_Teardown
(
bo
->
bereq
);
VBO_DerefBusyObj
(
wrk
,
&
req
->
busyobj
);
switch
(
wrk
->
handling
)
{
case
VCL_RET_ERROR
:
req
->
req_step
=
R_STP_ERROR
;
break
;
case
VCL_RET_PASS
:
req
->
req_step
=
R_STP_PASS
;
break
;
case
VCL_RET_RESTART
:
req
->
req_step
=
R_STP_RESTART
;
break
;
default:
WRONG
(
"Illegal action in vcl_miss{}"
);
}
return
(
REQ_FSM_MORE
);
}
/*--------------------------------------------------------------------
...
...
bin/varnishtest/tests/c00012.vtc
View file @
88db6f66
...
...
@@ -25,7 +25,7 @@ client c1 {
rxresp
expect resp.status == 200
expect resp.bodylen == 7
expect resp.http.x-varnish == "100
4
"
expect resp.http.x-varnish == "100
3
"
}
client c1 -run
bin/varnishtest/tests/c00033.vtc
deleted
100644 → 0
View file @
ac8de26b
varnishtest "Inline C access to purges (could be retired)"
server s1 {
rxreq
txresp -hdr "Vary: foo" -bodylen 1
rxreq
txresp -hdr "Vary: foo" -bodylen 2
rxreq
txresp -hdr "Vary: foo" -bodylen 3
rxreq
txresp -hdr "Vary: foo" -bodylen 4
rxreq
txresp -hdr "Vary: foo" -bodylen 5
rxreq
txresp -hdr "Vary: foo" -bodylen 6
} -start
varnish v1 -vcl+backend {
sub vcl_recv {
if (req.method == "PURGE") {
return (hash);
}
}
sub vcl_lookup {
if (req.method == "PURGE") {
C{ VRT_purge(ctx, 0, 0); }C
return (error(456, "got it"));
}
}
sub vcl_miss {
if (req.method == "PURGE") {
C{ VRT_purge(ctx, 0, 0); }C
return (error(456, "got it"));
}
}
} -start
client c1 {
txreq -hdr "foo: bar1"
rxresp
expect resp.bodylen == 1
txreq -hdr "foo: bar2"
rxresp
expect resp.bodylen == 2
txreq -hdr "foo: bar1"
rxresp
expect resp.bodylen == 1
txreq -hdr "foo: bar2"
rxresp
expect resp.bodylen == 2
txreq -req "PURGE" -hdr "foo: bar1"
rxresp
expect resp.status == 456
} -run
client c1 {
txreq -hdr "foo: bar1"
rxresp
expect resp.bodylen == 3
txreq -hdr "foo: bar2"
rxresp
expect resp.bodylen == 4
txreq -req "PURGE" -hdr "foo: bar3"
rxresp
expect resp.status == 456
} -run
client c1 {
txreq -hdr "foo: bar1"
rxresp
expect resp.bodylen == 5
txreq -hdr "foo: bar2"
rxresp
expect resp.bodylen == 6
} -run
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