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
0375791c
Commit
0375791c
authored
Jan 21, 2016
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Start using our new "busy" criteria for objcores
parent
e6aaefc5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
cache_hash.c
bin/varnishd/cache/cache_hash.c
+2
-1
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+3
-1
c00013.vtc
bin/varnishtest/tests/c00013.vtc
+2
-2
No files found.
bin/varnishd/cache/cache_hash.c
View file @
0375791c
...
...
@@ -398,8 +398,9 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
if
(
oc
->
flags
&
OC_F_FAILED
)
continue
;
if
(
oc
->
flags
&
OC_F_BUSY
)
{
if
(
oc
->
boc
!=
NULL
&&
oc
->
boc
->
state
<
BOS_STREAM
)
{
CHECK_OBJ_ORNULL
(
oc
->
boc
,
BOC_MAGIC
);
if
(
req
->
hash_ignore_busy
)
continue
;
...
...
bin/varnishd/cache/cache_req_fsm.c
View file @
0375791c
...
...
@@ -203,7 +203,9 @@ cnt_deliver(struct worker *wrk, struct req *req)
HSH_DerefBusy
(
wrk
,
req
->
objcore
);
boc
=
NULL
;
}
else
if
(
!
boc
->
busyobj
->
do_stream
)
{
ObjWaitState
(
boc
,
BOS_FINISHED
);
/* XXX These should go away */
xxxassert
(
boc
->
state
>=
BOS_STREAM
);
xxxassert
(
boc
->
state
>=
BOS_FINISHED
);
HSH_DerefBusy
(
wrk
,
req
->
objcore
);
boc
=
NULL
;
}
...
...
bin/varnishtest/tests/c00013.vtc
View file @
0375791c
...
...
@@ -43,5 +43,5 @@ client c2 {
client c1 -wait
varnish v1 -expect busy_sleep
=
= 1
varnish v1 -expect busy_wakeup
=
= 1
varnish v1 -expect busy_sleep
>
= 1
varnish v1 -expect busy_wakeup
>
= 1
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