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
3bb4686b
Commit
3bb4686b
authored
Dec 03, 2018
by
Nils Goroll
Committed by
Dridi Boukelmoune
Feb 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge HSH_EXP and HSH_EXPBUSY into HSH_GRACE
they are the same case
parent
58d10b09
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
cache_hash.c
bin/varnishd/cache/cache_hash.c
+2
-2
cache_req_fsm.c
bin/varnishd/cache/cache_req_fsm.c
+1
-1
hash_slinger.h
bin/varnishd/hash/hash_slinger.h
+1
-2
No files found.
bin/varnishd/cache/cache_hash.c
View file @
3bb4686b
...
...
@@ -496,7 +496,7 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
}
else
{
if
(
exp_oc
->
hits
<
LONG_MAX
)
exp_oc
->
hits
++
;
retval
=
HSH_
EXPBUSY
;
retval
=
HSH_
GRACE
;
}
}
else
{
Lck_Unlock
(
&
oh
->
mtx
);
...
...
@@ -518,7 +518,7 @@ HSH_Lookup(struct req *req, struct objcore **ocp, struct objcore **bocp,
assert
(
HSH_DerefObjHead
(
wrk
,
&
oh
));
if
(
exp_oc
->
hits
<
LONG_MAX
)
exp_oc
->
hits
++
;
return
(
HSH_
EXP
);
return
(
HSH_
GRACE
);
}
/* There are one or more busy objects, wait for them */
...
...
bin/varnishd/cache/cache_req_fsm.c
View file @
3bb4686b
...
...
@@ -556,7 +556,7 @@ cnt_lookup(struct worker *wrk, struct req *req)
}
wrk
->
stats
->
cache_hit
++
;
req
->
is_hit
=
1
;
if
(
lr
==
HSH_
EXP
||
lr
==
HSH_EXPBUSY
)
if
(
lr
==
HSH_
GRACE
)
wrk
->
stats
->
cache_hit_grace
++
;
req
->
req_step
=
R_STP_DELIVER
;
return
(
REQ_FSM_MORE
);
...
...
bin/varnishd/hash/hash_slinger.h
View file @
3bb4686b
...
...
@@ -53,8 +53,7 @@ enum lookup_e {
HSH_MISS
,
HSH_BUSY
,
HSH_HIT
,
HSH_EXP
,
HSH_EXPBUSY
HSH_GRACE
};
/* mgt_hash.c */
...
...
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